diff --git a/stepmania/src/RageSoundManager.h b/stepmania/src/RageSoundManager.h index a66d996990..9b7898bcf1 100644 --- a/stepmania/src/RageSoundManager.h +++ b/stepmania/src/RageSoundManager.h @@ -31,6 +31,8 @@ class RageSoundManager /* Prefs: */ float MixVolume; + RageSound *music; + public: RageMutex lock; @@ -58,9 +60,8 @@ public: set all_sounds; void PlayMusic(CString file, bool loop = true, float start_sec = -1, float length_sec = -1); + void StopMusic() { PlayMusic(""); } static void MixAudio(Sint16 *dst, const Sint16 *src, Uint32 len, float volume); - - RageSound *music; }; /* This inputs and outputs 16-bit 44khz stereo input. */ diff --git a/stepmania/src/ScreenAttract.cpp b/stepmania/src/ScreenAttract.cpp index 0073fed4bd..e21d6258f6 100644 --- a/stepmania/src/ScreenAttract.cpp +++ b/stepmania/src/ScreenAttract.cpp @@ -102,7 +102,7 @@ void ScreenAttract::Input( const DeviceInput& DeviceI, const InputEventType type break; case MENU_BUTTON_COIN: Screen::MenuCoin( MenuI.player ); // increment coins, play sound - SOUNDMAN->music->StopPlaying(); + SOUNDMAN->StopMusic(); ::Sleep( 200 ); // do a little pause, like the arcade does SCREENMAN->SetNewScreen( "ScreenTitleMenu" ); break; @@ -117,7 +117,7 @@ void ScreenAttract::Input( const DeviceInput& DeviceI, const InputEventType type // fall through case PrefsManager::COIN_FREE: case PrefsManager::COIN_HOME: - SOUNDMAN->music->StopPlaying(); + SOUNDMAN->StopMusic(); SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","insert coin") ); ::Sleep( 200 ); // do a little pause, like the arcade does SCREENMAN->SetNewScreen( "ScreenTitleMenu" ); diff --git a/stepmania/src/ScreenEditMenu.cpp b/stepmania/src/ScreenEditMenu.cpp index b621123072..989b133ea2 100644 --- a/stepmania/src/ScreenEditMenu.cpp +++ b/stepmania/src/ScreenEditMenu.cpp @@ -150,7 +150,7 @@ void ScreenEditMenu::MenuStart( PlayerNumber pn ) return; } - SOUNDMAN->music->StopPlaying(); + SOUNDMAN->StopMusic(); // get the style @@ -168,7 +168,7 @@ void ScreenEditMenu::MenuBack( PlayerNumber pn ) { m_Menu.TweenOffScreenToBlack( SM_None, true ); - SOUNDMAN->music->StopPlaying(); + SOUNDMAN->StopMusic(); m_Fade.CloseWipingLeft( SM_GoToPrevScreen ); } diff --git a/stepmania/src/ScreenEz2SelectMusic.cpp b/stepmania/src/ScreenEz2SelectMusic.cpp index 99d41ca235..30d18e4e0c 100644 --- a/stepmania/src/ScreenEz2SelectMusic.cpp +++ b/stepmania/src/ScreenEz2SelectMusic.cpp @@ -61,7 +61,7 @@ ScreenEz2SelectMusic::ScreenEz2SelectMusic() if(PREVIEWMUSICMODE == 1) { - SOUNDMAN->music->StopPlaying(); + SOUNDMAN->StopMusic(); iConfirmSelection = 0; } @@ -273,7 +273,7 @@ void ScreenEz2SelectMusic::HandleScreenMessage( const ScreenMessage SM ) } else { - SOUNDMAN->music->StopPlaying(); + SOUNDMAN->StopMusic(); SCREENMAN->SetNewScreen( "ScreenStage" ); } break; @@ -294,7 +294,7 @@ void ScreenEz2SelectMusic::MenuRight( PlayerNumber pn, const InputEventType type void ScreenEz2SelectMusic::MenuBack( PlayerNumber pn ) { - SOUNDMAN->music->StopPlaying(); + SOUNDMAN->StopMusic(); m_Menu.TweenOffScreenToBlack( SM_GoToPrevScreen, true ); } @@ -392,7 +392,7 @@ void ScreenEz2SelectMusic::EasierDifficulty( PlayerNumber pn ) if(PREVIEWMUSICMODE == 1 && iConfirmSelection == 1) { iConfirmSelection = 0; - SOUNDMAN->music->StopPlaying(); + SOUNDMAN->StopMusic(); } m_iSelection[pn]--; @@ -424,7 +424,7 @@ void ScreenEz2SelectMusic::HarderDifficulty( PlayerNumber pn ) if(PREVIEWMUSICMODE == 1 && iConfirmSelection == 1) { iConfirmSelection = 0; - SOUNDMAN->music->StopPlaying(); + SOUNDMAN->StopMusic(); } m_iSelection[pn]++; @@ -446,7 +446,7 @@ void ScreenEz2SelectMusic::MusicChanged() if(PREVIEWMUSICMODE == 1 && iConfirmSelection == 1) { iConfirmSelection = 0; - SOUNDMAN->music->StopPlaying(); + SOUNDMAN->StopMusic(); } int pn; diff --git a/stepmania/src/ScreenEz2SelectPlayer.cpp b/stepmania/src/ScreenEz2SelectPlayer.cpp index 77046dad50..0bd2f2d395 100644 --- a/stepmania/src/ScreenEz2SelectPlayer.cpp +++ b/stepmania/src/ScreenEz2SelectPlayer.cpp @@ -175,7 +175,7 @@ void ScreenEz2SelectPlayer::HandleScreenMessage( const ScreenMessage SM ) m_Menu.TweenOffScreenToMenu( SM_GoToNextScreen ); break; case SM_GoToPrevScreen: - SOUNDMAN->music->StopPlaying(); + SOUNDMAN->StopMusic(); SCREENMAN->SetNewScreen( "ScreenTitleMenu" ); break; case SM_GoToNextScreen: @@ -193,7 +193,7 @@ presses the button bound to back void ScreenEz2SelectPlayer::MenuBack( PlayerNumber pn ) { - SOUNDMAN->music->StopPlaying(); + SOUNDMAN->StopMusic(); m_Menu.TweenOffScreenToBlack( SM_GoToPrevScreen, true ); } diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 3d97d70e1c..93f6d14fbf 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -113,7 +113,7 @@ ScreenGameplay::ScreenGameplay( bool bDemonstration ) g_fTickEarlySecondsCache = TICK_EARLY_SECONDS; - SOUNDMAN->music->StopPlaying(); + SOUNDMAN->StopMusic(); /* It's OK to operate on GAMESTATE here, but not in the constructor */ diff --git a/stepmania/src/ScreenSelectCourse.cpp b/stepmania/src/ScreenSelectCourse.cpp index 1622f0c4fa..3a982e94fe 100644 --- a/stepmania/src/ScreenSelectCourse.cpp +++ b/stepmania/src/ScreenSelectCourse.cpp @@ -316,7 +316,7 @@ void ScreenSelectCourse::MenuStart( PlayerNumber pn ) void ScreenSelectCourse::MenuBack( PlayerNumber pn ) { - SOUNDMAN->music->StopPlaying(); + SOUNDMAN->StopMusic(); m_Menu.TweenOffScreenToBlack( SM_GoToPrevScreen, true ); } diff --git a/stepmania/src/ScreenSelectMode.cpp b/stepmania/src/ScreenSelectMode.cpp index 5e4c4cedec..eea549d10a 100644 --- a/stepmania/src/ScreenSelectMode.cpp +++ b/stepmania/src/ScreenSelectMode.cpp @@ -216,7 +216,7 @@ void ScreenSelectMode::HandleScreenMessage( const ScreenMessage SM ) m_Menu.TweenOffScreenToMenu( SM_GoToNextScreen ); break; case SM_GoToPrevScreen: - SOUNDMAN->music->StopPlaying(); + SOUNDMAN->StopMusic(); SCREENMAN->SetNewScreen( "ScreenTitleMenu" ); break; case SM_GoToNextScreen: @@ -289,7 +289,7 @@ presses the button bound to back ************************************/ void ScreenSelectMode::MenuBack( PlayerNumber pn ) { - SOUNDMAN->music->StopPlaying(); + SOUNDMAN->StopMusic(); m_Menu.TweenOffScreenToBlack( SM_GoToPrevScreen, true ); } diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index 80c48fb3c1..5ab241c7c3 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -476,7 +476,7 @@ void ScreenSelectMusic::Input( const DeviceInput& DeviceI, InputEventType type, else if( m_MusicWheel.NextSort() ) { - SOUNDMAN->music->StopPlaying(); + SOUNDMAN->StopMusic(); // m_MusicSortDisplay.FadeOff( 0, "fade", TWEEN_TIME ); @@ -568,7 +568,7 @@ void ScreenSelectMusic::HandleScreenMessage( const ScreenMessage SM ) } else { - SOUNDMAN->music->StopPlaying(); + SOUNDMAN->StopMusic(); SCREENMAN->SetNewScreen( "ScreenStage" ); } break; @@ -593,7 +593,7 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn ) { if( m_MusicWheel.NextSort() ) { - SOUNDMAN->music->StopPlaying(); + SOUNDMAN->StopMusic(); // m_MusicSortDisplay.FadeOff( 0, "fade", TWEEN_TIME ); @@ -678,7 +678,7 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn ) void ScreenSelectMusic::MenuBack( PlayerNumber pn ) { - SOUNDMAN->music->StopPlaying(); + SOUNDMAN->StopMusic(); m_Menu.TweenOffScreenToBlack( SM_GoToPrevScreen, true ); } @@ -760,7 +760,7 @@ void ScreenSelectMusic::AfterMusicChange() break; case TYPE_SONG: { - SOUNDMAN->music->StopPlaying(); + SOUNDMAN->StopMusic(); m_fPlaySampleCountdown = SAMPLE_MUSIC_DELAY; for( int pn = 0; pn < NUM_PLAYERS; ++pn) { diff --git a/stepmania/src/ScreenSelectStyle.cpp b/stepmania/src/ScreenSelectStyle.cpp index 0d8593abb2..6b2ab9194a 100644 --- a/stepmania/src/ScreenSelectStyle.cpp +++ b/stepmania/src/ScreenSelectStyle.cpp @@ -161,7 +161,7 @@ void ScreenSelectStyle::HandleScreenMessage( const ScreenMessage SM ) MenuStart(PLAYER_INVALID); break; case SM_GoToPrevScreen: - SOUNDMAN->music->StopPlaying(); + SOUNDMAN->StopMusic(); SCREENMAN->SetNewScreen( "ScreenTitleMenu" ); break; case SM_GoToNextScreen: @@ -290,7 +290,7 @@ void ScreenSelectStyle::MenuStart( PlayerNumber pn ) void ScreenSelectStyle::MenuBack( PlayerNumber pn ) { - SOUNDMAN->music->StopPlaying(); + SOUNDMAN->StopMusic(); m_Menu.TweenOffScreenToBlack( SM_GoToPrevScreen, true ); diff --git a/stepmania/src/ScreenSelectStyle5th.cpp b/stepmania/src/ScreenSelectStyle5th.cpp index a42efdc52d..ab8c1a809c 100644 --- a/stepmania/src/ScreenSelectStyle5th.cpp +++ b/stepmania/src/ScreenSelectStyle5th.cpp @@ -219,7 +219,7 @@ void ScreenSelectStyle5th::HandleScreenMessage( const ScreenMessage SM ) MenuStart(PLAYER_1); break; case SM_GoToPrevScreen: - SOUNDMAN->music->StopPlaying(); + SOUNDMAN->StopMusic(); SCREENMAN->SetNewScreen( "ScreenTitleMenu" ); break; case SM_GoToNextScreen: @@ -291,7 +291,7 @@ void ScreenSelectStyle5th::MenuStart( PlayerNumber pn ) void ScreenSelectStyle5th::MenuBack( PlayerNumber pn ) { - SOUNDMAN->music->StopPlaying(); + SOUNDMAN->StopMusic(); m_Menu.TweenOffScreenToBlack( SM_GoToPrevScreen, true ); } diff --git a/stepmania/src/ScreenSongOptions.cpp b/stepmania/src/ScreenSongOptions.cpp index 1ee6191abf..20d5db50d5 100644 --- a/stepmania/src/ScreenSongOptions.cpp +++ b/stepmania/src/ScreenSongOptions.cpp @@ -112,7 +112,7 @@ void ScreenSongOptions::GoToPrevState() void ScreenSongOptions::GoToNextState() { - SOUNDMAN->music->StopPlaying(); + SOUNDMAN->StopMusic(); SCREENMAN->SetNewScreen( "ScreenStage" ); } diff --git a/stepmania/src/ScreenStage.cpp b/stepmania/src/ScreenStage.cpp index ccd56b106e..8ae0aa264f 100644 --- a/stepmania/src/ScreenStage.cpp +++ b/stepmania/src/ScreenStage.cpp @@ -56,7 +56,7 @@ enum StageMode ScreenStage::ScreenStage() { - SOUNDMAN->music->StopPlaying(); + SOUNDMAN->StopMusic(); g_StageType = (StageType)STAGE_TYPE; diff --git a/stepmania/src/ScreenTest.cpp b/stepmania/src/ScreenTest.cpp index 64a0272dfc..fe36a7479a 100644 --- a/stepmania/src/ScreenTest.cpp +++ b/stepmania/src/ScreenTest.cpp @@ -43,7 +43,7 @@ ScreenTest::ScreenTest() current = NULL; cur_screen = -1; - SOUNDMAN->music->StopPlaying(); + SOUNDMAN->StopMusic(); SetScreen(0); } diff --git a/stepmania/src/TransitionKeepAlive.cpp b/stepmania/src/TransitionKeepAlive.cpp index f35b881150..4d9c869d08 100644 --- a/stepmania/src/TransitionKeepAlive.cpp +++ b/stepmania/src/TransitionKeepAlive.cpp @@ -95,7 +95,7 @@ void TransitionKeepAlive::OpenWipingRight( ScreenMessage send_when_done ) void TransitionKeepAlive::OpenWipingLeft( ScreenMessage send_when_done ) { if( STOP_MUSIC_ON_NEXT ) - SOUNDMAN->music->StopPlaying(); + SOUNDMAN->StopMusic(); this->SetTransitionTime( KEEP_ALIVE_BACKWARD_TRANSITION_TIME );