simplify

stepmania/src/MenuTimer.cpp

@@ -2,7 +2,6 @@
 #include "MenuTimer.h"
 #include "RageUtil.h"
 #include "ScreenManager.h"
-#include "AnnouncerManager.h"
 #include "ThemeManager.h"
 #include "Font.h"
 #include "GameSoundManager.h"
@@ -80,7 +79,7 @@ void MenuTimer::Update( float fDeltaTime )
 		return;
 
 	if( fOldSecondsLeft > 5.5  &&  fNewSecondsLeft < 5.5 )	// transition to below 5.5
-		SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("hurry up") );
+		SOUND->PlayOnceFromAnnouncer( "hurry up" );
 
 
 	int iCrossed = (int)floorf(fOldSecondsLeft);

stepmania/src/ScreenWithMenuElements.cpp

@@ -9,7 +9,6 @@
 #include "PrefsManager.h"
 #include "ScreenManager.h"
 #include "GameSoundManager.h"
-#include "AnnouncerManager.h"
 #include "MemoryCardDisplay.h"
 
 #define TIMER_STEALTH				THEME->GetMetricB(m_sName,"TimerStealth")
@@ -150,7 +149,7 @@ void ScreenWithMenuElements::BeginScreen()
 	this->SortByDrawOrder();
 	m_In.StartTransitioning( SM_DoneFadingIn );
 
-	SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo(m_sName+" intro") );
+	SOUND->PlayOnceFromAnnouncer( m_sName+" intro" );
 	StartPlayingMusic();
 
 	/* Evaluate FirstUpdateCommand. */