diff --git a/stepmania/src/LifeMeterBattery.h b/stepmania/src/LifeMeterBattery.h index 984e6ef325..4385f6741c 100644 --- a/stepmania/src/LifeMeterBattery.h +++ b/stepmania/src/LifeMeterBattery.h @@ -15,7 +15,7 @@ #include "LifeMeter.h" #include "Sprite.h" #include "BitmapText.h" -#include "RageSoundSample.h" +#include "RageSound.h" class LifeMeterBattery : public LifeMeter @@ -50,8 +50,8 @@ private: BitmapText m_textNumLives; BitmapText m_textPercent; - RageSoundSample m_soundLoseLife; - RageSoundSample m_soundGainLife; + RageSound m_soundLoseLife; + RageSound m_soundGainLife; }; diff --git a/stepmania/src/MenuElements.h b/stepmania/src/MenuElements.h index b66c649993..e25fe7065f 100644 --- a/stepmania/src/MenuElements.h +++ b/stepmania/src/MenuElements.h @@ -76,8 +76,8 @@ public: TransitionKeepAlive m_KeepAlive; // going back and forward TransitionInvisible m_Invisible; // for going forward to Menu - RageSoundSample m_soundSwoosh; - RageSoundSample m_soundBack; + RageSound m_soundSwoosh; + RageSound m_soundBack; }; #endif diff --git a/stepmania/src/MenuTimer.cpp b/stepmania/src/MenuTimer.cpp index 8615423b61..d30be0a97a 100644 --- a/stepmania/src/MenuTimer.cpp +++ b/stepmania/src/MenuTimer.cpp @@ -83,7 +83,7 @@ void MenuTimer::Update( float fDeltaTime ) float fNewSecondsLeft = fOldSecondsLeft - fDeltaTime; if( fOldSecondsLeft > 5.5 && fNewSecondsLeft < 5.5 ) // transition to below 5.5 - SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("hurry up") ); + SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("hurry up") ); else if( fOldSecondsLeft > 5 && fNewSecondsLeft < 5 ) // transition to below 5 { m_textDigit1.SetEffectGlowing( 10, RageColor(1,0,0,0), RageColor(1,0,0,1) ); diff --git a/stepmania/src/MenuTimer.h b/stepmania/src/MenuTimer.h index 1d7e265bac..717e46f3fd 100644 --- a/stepmania/src/MenuTimer.h +++ b/stepmania/src/MenuTimer.h @@ -15,7 +15,7 @@ #include "Song.h" #include "ActorFrame.h" #include "BitmapText.h" -#include "RageSoundSample.h" +#include "RageSound.h" class MenuTimer : public ActorFrame @@ -41,7 +41,7 @@ protected: BitmapText m_textDigit1; BitmapText m_textDigit2; - RageSoundSample m_soundBeep; + RageSound m_soundBeep; }; #endif diff --git a/stepmania/src/MusicWheel.h b/stepmania/src/MusicWheel.h index 5888f22260..6839d743c4 100644 --- a/stepmania/src/MusicWheel.h +++ b/stepmania/src/MusicWheel.h @@ -167,11 +167,11 @@ protected: // bool m_bUseRandomExtra; - RageSoundSample m_soundChangeMusic; - RageSoundSample m_soundChangeSort; - RageSoundSample m_soundExpand; - RageSoundSample m_soundStart; - RageSoundSample m_soundLocked; + RageSound m_soundChangeMusic; + RageSound m_soundChangeSort; + RageSound m_soundExpand; + RageSound m_soundStart; + RageSound m_soundLocked; CString GetSectionNameFromSongAndSort( Song* pSong, SongSortOrder so ); bool WheelItemIsVisible(int n); diff --git a/stepmania/src/RageSoundManager.h b/stepmania/src/RageSoundManager.h index 4cc23b457b..0be495df5c 100644 --- a/stepmania/src/RageSoundManager.h +++ b/stepmania/src/RageSoundManager.h @@ -9,9 +9,6 @@ class RageSound; -//#define PlayOnceStreamed PlayOnce -//#define PlayOnceStreamedFromDir PlayOnceFromDir - class RageSoundManager { /* Set of sounds that we've taken over (and are responsible for deleting diff --git a/stepmania/src/RandomSample.cpp b/stepmania/src/RandomSample.cpp index 10709a71d4..74308d2e86 100644 --- a/stepmania/src/RandomSample.cpp +++ b/stepmania/src/RandomSample.cpp @@ -53,7 +53,7 @@ bool RandomSample::LoadSound( CString sSoundFilePath ) { LOG->Trace( "RandomSample::LoadSound( %s )", sSoundFilePath.GetString() ); - RageSoundSample* pSS = new RageSoundSample; + RageSound *pSS = new RageSound; pSS->Load( sSoundFilePath ); diff --git a/stepmania/src/RandomSample.h b/stepmania/src/RandomSample.h index c5c49b4046..b13b671567 100644 --- a/stepmania/src/RandomSample.h +++ b/stepmania/src/RandomSample.h @@ -11,7 +11,7 @@ ----------------------------------------------------------------------------- */ -#include "RageSoundSample.h" +#include "RageSound.h" #include "RageUtil.h" class RandomSample @@ -39,7 +39,7 @@ private: bool LoadSound( CString sSoundFilePath ); - CArray m_pSamples; + CArray m_pSamples; int m_iIndexLastPlayed; }; diff --git a/stepmania/src/ScreenCaution.cpp b/stepmania/src/ScreenCaution.cpp index 2a8c451db4..fe77a9a109 100644 --- a/stepmania/src/ScreenCaution.cpp +++ b/stepmania/src/ScreenCaution.cpp @@ -71,7 +71,7 @@ void ScreenCaution::HandleScreenMessage( const ScreenMessage SM ) m_Wipe.CloseWipingRight( SM_GoToNextScreen ); break; case SM_DoneOpening: - SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("caution") ); + SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("caution") ); break; case SM_GoToPrevScreen: SCREENMAN->SetNewScreen( "ScreenTitleMenu" ); @@ -87,7 +87,7 @@ void ScreenCaution::MenuStart( PlayerNumber pn ) if( pn != PLAYER_INVALID && !GAMESTATE->m_bSideIsJoined[pn] ) { GAMESTATE->m_bSideIsJoined[pn] = true; - SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","menu start") ); + SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","menu start") ); SCREENMAN->RefreshCreditsMessages(); return; // don't fall though } @@ -102,6 +102,6 @@ void ScreenCaution::MenuBack( PlayerNumber pn ) return; this->ClearMessageQueue(); m_FadeWipe.CloseWipingLeft( SM_GoToPrevScreen ); - SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","menu back") ); + SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","menu back") ); } diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp index 5e45a2d01d..06841ef66f 100644 --- a/stepmania/src/ScreenEdit.cpp +++ b/stepmania/src/ScreenEdit.cpp @@ -285,7 +285,7 @@ ScreenEdit::ScreenEdit() m_textShortcuts.SetText( SHORTCUT_TEXT ); - m_soundChangeLine.Load( THEME->GetPathTo("Sounds","edit change line"), 10 ); + m_soundChangeLine.Load( THEME->GetPathTo("Sounds","edit change line") ); m_soundChangeSnap.Load( THEME->GetPathTo("Sounds","edit change snap") ); m_soundMarker.Load( THEME->GetPathTo("Sounds","edit marker") ); m_soundInvalid.Load( THEME->GetPathTo("Sounds","menu invalid") ); @@ -340,7 +340,7 @@ bool ScreenEdit::PlayTicks() const bool bFreeze; // HACK: Play the sound a little bit early to account for the fact that the middle of the tick sounds occurs 0.015 seconds into playing. - fPositionSeconds += (SOUND->GetPlayLatency()+0.018f) * m_soundMusic.GetPlaybackRate(); // HACK: Add 0.015 seconds to account for the fact that the middle of the tick sounds occurs 0.015 seconds into playing. + fPositionSeconds += (SOUNDMAN->GetPlayLatency()+0.018f) * m_soundMusic.GetPlaybackRate(); // HACK: Add 0.015 seconds to account for the fact that the middle of the tick sounds occurs 0.015 seconds into playing. GAMESTATE->m_pCurSong->GetBeatAndBPSFromElapsedTime( fPositionSeconds, fSongBeat, fBPS, bFreeze ); int iRowNow = BeatToNoteRowNotRounded( fSongBeat ); @@ -758,7 +758,7 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ GAMESTATE->m_pCurSong->Save(); SCREENMAN->SystemMessage( "Saved as SM and DWI." ); - SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","edit save") ); + SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","edit save") ); } break; case SDLK_UP: @@ -1259,7 +1259,7 @@ void ScreenEdit::InputActionMenu( const DeviceInput& DeviceI, const InputEventTy MenuItemLoseFocus( &m_textActionMenu[m_iMenuSelection] ); if( DeviceI.button == SDLK_RETURN ) { - SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","menu start") ); + SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","menu start") ); int iMenuKey = ACTION_MENU_ITEM_KEY[m_iMenuSelection]; InputEdit( DeviceInput(DEVICE_KEYBOARD,iMenuKey), IET_FIRST_PRESS, GameInput(), MenuInput(), StyleInput() ); } @@ -1271,7 +1271,7 @@ void ScreenEdit::InputActionMenu( const DeviceInput& DeviceI, const InputEventTy TransitionToEdit(); MenuItemLoseFocus( &m_textActionMenu[m_iMenuSelection] ); - SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","menu start") ); + SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","menu start") ); InputEdit( DeviceI, IET_FIRST_PRESS, GameInput(), MenuInput(), StyleInput() ); } } @@ -1339,7 +1339,7 @@ void ScreenEdit::InputNamingMenu( const DeviceInput& DeviceI, const InputEventTy MenuItemGainFocus( &m_textNamingMenu[m_iMenuSelection] ); break; case SDLK_RETURN: - SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","menu start") ); + SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","menu start") ); const std::pair& pairMenuKey = NAMING_MENU_ITEM_KEY[m_iMenuSelection]; InputNamingMenu( DeviceInput(DEVICE_KEYBOARD,pairMenuKey.first), IET_FIRST_PRESS, GameInput(), MenuInput(), StyleInput(), pairMenuKey.second ); break; @@ -1451,7 +1451,7 @@ void ScreenEdit::MenuItemGainFocus( BitmapText* menuitem ) { menuitem->SetEffectCamelion( 2.5, RageColor(1,1,1,1), RageColor(0,1,0,1) ); menuitem->SetZoom( 0.7f ); - SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","edit menu change") ); + SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","edit menu change") ); } void ScreenEdit::MenuItemLoseFocus( BitmapText* menuitem ) diff --git a/stepmania/src/ScreenEdit.h b/stepmania/src/ScreenEdit.h index 8ce2392650..0f8331cf31 100644 --- a/stepmania/src/ScreenEdit.h +++ b/stepmania/src/ScreenEdit.h @@ -77,10 +77,10 @@ protected: NoteData m_Clipboard; - RageSoundSample m_soundChangeLine; - RageSoundSample m_soundChangeSnap; - RageSoundSample m_soundMarker; - RageSoundSample m_soundInvalid; + RageSound m_soundChangeLine; + RageSound m_soundChangeSnap; + RageSound m_soundMarker; + RageSound m_soundInvalid; TransitionFade m_Fade; @@ -104,7 +104,7 @@ protected: BitmapText m_textNamingMenu[NUM_NAMING_MENU_ITEMS]; int m_iRowLastCrossed; - RageSoundSample m_soundAssistTick; + RageSound m_soundAssistTick; }; diff --git a/stepmania/src/ScreenEditMenu.cpp b/stepmania/src/ScreenEditMenu.cpp index 8994b75a82..b621123072 100644 --- a/stepmania/src/ScreenEditMenu.cpp +++ b/stepmania/src/ScreenEditMenu.cpp @@ -146,7 +146,7 @@ void ScreenEditMenu::MenuStart( PlayerNumber pn ) if( !GAMESTATE->m_pCurSong->HasMusic() ) { SCREENMAN->SystemMessage( "This song is missing a music file and cannot be edited" ); - SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","menu invalid") ); + SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","menu invalid") ); return; } diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index 35a5497ca2..15a88be156 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -565,11 +565,11 @@ ScreenEvaluation::ScreenEvaluation( bool bSummary ) m_sprTryExtraStage.SetEffectGlowing( 1.0f ); this->AddChild( &m_sprTryExtraStage ); - SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","evaluation extra stage") ); + SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","evaluation extra stage") ); } else if( bOneHasNewRecord && ANNOUNCER->HasSoundsFor("evaluation new record") ) { - SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("evaluation new record") ); + SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation new record") ); } else { @@ -579,13 +579,13 @@ ScreenEvaluation::ScreenEvaluation( bool bSummary ) case RM_ARCADE_STAGE: switch( max_grade ) { - case GRADE_E: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("evaluation e") ); break; - case GRADE_D: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("evaluation d") ); break; - case GRADE_C: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("evaluation c") ); break; - case GRADE_B: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("evaluation b") ); break; - case GRADE_A: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("evaluation a") ); break; - case GRADE_AA: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("evaluation aa") ); break; - case GRADE_AAA: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("evaluation aaa") ); break; + case GRADE_E: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation e") ); break; + case GRADE_D: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation d") ); break; + case GRADE_C: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation c") ); break; + case GRADE_B: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation b") ); break; + case GRADE_A: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation a") ); break; + case GRADE_AA: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation aa") ); break; + case GRADE_AAA: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation aaa") ); break; case GRADE_NO_DATA: default: ASSERT(0); // invalid grade @@ -595,13 +595,13 @@ ScreenEvaluation::ScreenEvaluation( bool bSummary ) case RM_ARCADE_SUMMARY: switch( max_grade ) { - case GRADE_E: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("evaluation final e") ); break; - case GRADE_D: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("evaluation final d") ); break; - case GRADE_C: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("evaluation final c") ); break; - case GRADE_B: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("evaluation final b") ); break; - case GRADE_A: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("evaluation final a") ); break; - case GRADE_AA: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("evaluation final aa") ); break; - case GRADE_AAA: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("evaluation final aaa") ); break; + case GRADE_E: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation final e") ); break; + case GRADE_D: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation final d") ); break; + case GRADE_C: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation final c") ); break; + case GRADE_B: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation final b") ); break; + case GRADE_A: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation final a") ); break; + case GRADE_AA: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation final aa") ); break; + case GRADE_AAA: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation final aaa") ); break; case GRADE_NO_DATA: default: ASSERT(0); // invalid grade @@ -833,7 +833,7 @@ void ScreenEvaluation::HandleScreenMessage( const ScreenMessage SM ) SCREENMAN->SetNewScreen( "ScreenFinalEvaluation" ); break; case SM_PlayCheer: - SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("evaluation cheer") ); + SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation cheer") ); break; } } @@ -883,7 +883,7 @@ void ScreenEvaluation::MenuStart( PlayerNumber pn ) /* Tween the screen out, but leave the MenuElements where they are. * Play the "swoosh" sound manually (would normally be played by the ME * tween out). */ - SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","menu swoosh") ); + SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","menu swoosh") ); TweenOffScreen(); SCREENMAN->SendMessageToTopScreen( SM_GoToFinalEvaluation, MENU_ELEMENTS_TWEEN_TIME ); } diff --git a/stepmania/src/ScreenEz2SelectMusic.cpp b/stepmania/src/ScreenEz2SelectMusic.cpp index ff22a74b6e..3bc8811956 100644 --- a/stepmania/src/ScreenEz2SelectMusic.cpp +++ b/stepmania/src/ScreenEz2SelectMusic.cpp @@ -128,7 +128,7 @@ void ScreenEz2SelectMusic::Input( const DeviceInput& DeviceI, const InputEventTy if( m_bMadeChoice && !m_bGoToOptions && MenuI.IsValid() && MenuI.button == MENU_BUTTON_START ) { - SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","menu start") ); + SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","menu start") ); m_bGoToOptions = true; m_sprOptionsMessage.SetState( 1 ); } diff --git a/stepmania/src/ScreenEz2SelectMusic.h b/stepmania/src/ScreenEz2SelectMusic.h index f72868e126..fda240108c 100644 --- a/stepmania/src/ScreenEz2SelectMusic.h +++ b/stepmania/src/ScreenEz2SelectMusic.h @@ -58,7 +58,7 @@ protected: int i_ErrorDetected; - RageSoundSample m_soundSelect; + RageSound m_soundSelect; }; diff --git a/stepmania/src/ScreenEz2SelectPlayer.cpp b/stepmania/src/ScreenEz2SelectPlayer.cpp index 6ad1857bc6..77046dad50 100644 --- a/stepmania/src/ScreenEz2SelectPlayer.cpp +++ b/stepmania/src/ScreenEz2SelectPlayer.cpp @@ -100,7 +100,7 @@ ScreenEz2SelectPlayer::ScreenEz2SelectPlayer() m_soundSelect.Load( THEME->GetPathTo("Sounds","menu start") ); - SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select player intro") ); + SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select player intro") ); SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","select player music") ); diff --git a/stepmania/src/ScreenEz2SelectPlayer.h b/stepmania/src/ScreenEz2SelectPlayer.h index 4ff6571fa0..29d581fe55 100644 --- a/stepmania/src/ScreenEz2SelectPlayer.h +++ b/stepmania/src/ScreenEz2SelectPlayer.h @@ -9,7 +9,7 @@ Andrew Livy #include "Screen.h" #include "Sprite.h" -#include "RageSoundSample.h" +#include "RageSound.h" #include "MenuElements.h" @@ -37,6 +37,6 @@ private: MenuElements m_Menu; - RageSoundSample m_soundSelect; + RageSound m_soundSelect; BGAnimation m_Background; }; diff --git a/stepmania/src/ScreenGameOver.cpp b/stepmania/src/ScreenGameOver.cpp index d95cb166a1..3c3629f6e9 100644 --- a/stepmania/src/ScreenGameOver.cpp +++ b/stepmania/src/ScreenGameOver.cpp @@ -48,7 +48,7 @@ void ScreenGameOver::HandleScreenMessage( const ScreenMessage SM ) switch( SM ) { case SM_PlayAnnouncer: - SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("game over") ); + SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("game over") ); break; case SM_StartFadingOut: m_Fade.CloseWipingRight( SM_GoToNextScreen ); diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 390d6dae7c..081736a775 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -676,7 +676,7 @@ bool ScreenGameplay::PlayTicks() const bool bFreeze; // HACK: Play the sound a little bit early to account for the fact that the middle of the tick sounds occurs 0.015 seconds into playing. - fPositionSeconds += (SOUND->GetPlayLatency()+g_fTickEarlySecondsCache) * m_soundMusic.GetPlaybackRate(); + fPositionSeconds += (SOUNDMAN->GetPlayLatency()+g_fTickEarlySecondsCache) * m_soundMusic.GetPlaybackRate(); GAMESTATE->m_pCurSong->GetBeatAndBPSFromElapsedTime( fPositionSeconds, fSongBeat, fBPS, bFreeze ); int iRowNow = BeatToNoteRowNotRounded( fSongBeat ); @@ -887,7 +887,7 @@ void ScreenGameplay::Input( const DeviceInput& DeviceI, const InputEventType typ && !m_Fade.IsClosing() ) { m_soundMusic.StopPlaying(); - SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","insert coin") ); + SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","insert coin") ); ::Sleep( 1000 ); // do a little pause, like the arcade does this->SendScreenMessage( SM_GoToTitleMenu, 0 ); } @@ -994,7 +994,7 @@ void ScreenGameplay::Input( const DeviceInput& DeviceI, const InputEventType typ (DeviceI.device!=DEVICE_KEYBOARD && type==IET_FAST_REPEAT) ) { m_DancingState = STATE_OUTRO; - SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","menu back") ); + SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","menu back") ); /* Hmm. There are a bunch of subtly different ways we can * tween out: * 1. Keep rendering the song, and keep it moving. This might @@ -1227,7 +1227,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM ) else { this->SendScreenMessage( SM_ShowCleared, 1 ); - SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("gameplay cleared") ); + SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("gameplay cleared") ); } } } @@ -1472,7 +1472,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM ) SCREENMAN->SendMessageToTopScreen( SM_GoToScreenAfterFail, 5.0f ); break; case SM_PlayFailComment: - SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("gameplay failed") ); + SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("gameplay failed") ); break; case SM_GoToScreenAfterFail: diff --git a/stepmania/src/ScreenGameplay.h b/stepmania/src/ScreenGameplay.h index 36615ca89b..71138d65c5 100644 --- a/stepmania/src/ScreenGameplay.h +++ b/stepmania/src/ScreenGameplay.h @@ -149,11 +149,9 @@ private: int m_iRowLastCrossed; - RageSoundSample m_soundAssistTick; - - RageSoundSample m_soundToasty; - + RageSound m_soundAssistTick; + RageSound m_soundToasty; RageSound m_soundMusic; }; diff --git a/stepmania/src/ScreenMusicScroll.cpp b/stepmania/src/ScreenMusicScroll.cpp index dfdca29b07..61b89f1135 100644 --- a/stepmania/src/ScreenMusicScroll.cpp +++ b/stepmania/src/ScreenMusicScroll.cpp @@ -186,7 +186,7 @@ ScreenMusicScroll::ScreenMusicScroll() this->AddChild( &m_Fade ); - SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("music scroll") ); + SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("music scroll") ); SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","music scroll music") ); diff --git a/stepmania/src/ScreenOptions.h b/stepmania/src/ScreenOptions.h index 8397e4bd19..f3b6c66a8a 100644 --- a/stepmania/src/ScreenOptions.h +++ b/stepmania/src/ScreenOptions.h @@ -106,10 +106,10 @@ protected: BitmapText m_textExplanation; - RageSoundSample m_SoundChangeCol; - RageSoundSample m_SoundNextRow; - RageSoundSample m_SoundPrevRow; - RageSoundSample m_SoundStart; + RageSound m_SoundChangeCol; + RageSound m_SoundNextRow; + RageSound m_SoundPrevRow; + RageSound m_SoundStart; TransitionInvisible m_Wipe; }; diff --git a/stepmania/src/ScreenPlayerOptions.cpp b/stepmania/src/ScreenPlayerOptions.cpp index db2fabb1f6..30df04e7ab 100644 --- a/stepmania/src/ScreenPlayerOptions.cpp +++ b/stepmania/src/ScreenPlayerOptions.cpp @@ -62,7 +62,7 @@ ScreenPlayerOptions::ScreenPlayerOptions() : NUM_PLAYER_OPTIONS_LINES, true ); - SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("player options intro") ); + SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("player options intro") ); } diff --git a/stepmania/src/ScreenPrompt.cpp b/stepmania/src/ScreenPrompt.cpp index b2e6f1fca5..57aa039e6c 100644 --- a/stepmania/src/ScreenPrompt.cpp +++ b/stepmania/src/ScreenPrompt.cpp @@ -77,7 +77,7 @@ ScreenPrompt::ScreenPrompt( ScreenMessage SM_SendWhenDone, CString sText, bool b m_textAnswer[m_bAnswer].SetEffectGlowing(); - SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","menu prompt") ); + SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","menu prompt") ); } void ScreenPrompt::Update( float fDeltaTime ) @@ -135,7 +135,7 @@ void ScreenPrompt::MenuRight( PlayerNumber pn ) m_rectAnswerBox.SetTweenXY( m_textAnswer[m_bAnswer].GetX(), m_textAnswer[m_bAnswer].GetY() ); m_rectAnswerBox.SetTweenZoomX( m_textAnswer[m_bAnswer].GetWidestLineWidthInSourcePixels()+10.0f ); - SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","edit change line") ); + SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","edit change line") ); } void ScreenPrompt::MenuStart( PlayerNumber pn ) @@ -155,7 +155,7 @@ void ScreenPrompt::MenuStart( PlayerNumber pn ) m_textAnswer[1].BeginTweening( 0.2f ); m_textAnswer[1].SetTweenDiffuse( RageColor(1,1,1,0) ); - SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","menu start") ); + SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","menu start") ); if( m_bAnswer ) if( m_pOnYes ) diff --git a/stepmania/src/ScreenSelectCourse.cpp b/stepmania/src/ScreenSelectCourse.cpp index 170f1682bb..1622f0c4fa 100644 --- a/stepmania/src/ScreenSelectCourse.cpp +++ b/stepmania/src/ScreenSelectCourse.cpp @@ -129,7 +129,7 @@ ScreenSelectCourse::ScreenSelectCourse() m_soundSelect.Load( THEME->GetPathTo("Sounds","menu start") ); m_soundOptionsChange.Load( THEME->GetPathTo("Sounds","select music change options") ); - SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select course intro") ); + SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select course intro") ); SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","select course music") ); @@ -216,7 +216,7 @@ void ScreenSelectCourse::Input( const DeviceInput& DeviceI, InputEventType type, { m_bGoToOptions = true; m_sprOptionsMessage.SetState( 1 ); - SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","menu start") ); + SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","menu start") ); return; } @@ -279,7 +279,7 @@ void ScreenSelectCourse::MenuStart( PlayerNumber pn ) switch( m_MusicWheel.GetSelectedType() ) { case TYPE_COURSE: - SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select course comment general") ); + SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select course comment general") ); TweenOffScreen(); diff --git a/stepmania/src/ScreenSelectCourse.h b/stepmania/src/ScreenSelectCourse.h index cfbc5c9d2a..3dcd2fe3bc 100644 --- a/stepmania/src/ScreenSelectCourse.h +++ b/stepmania/src/ScreenSelectCourse.h @@ -12,7 +12,7 @@ #include "Screen.h" #include "Sprite.h" #include "BitmapText.h" -#include "RageSoundSample.h" +#include "RageSound.h" #include "GameConstantsAndTypes.h" #include "MusicWheel.h" #include "CourseContentsFrame.h" @@ -60,8 +60,8 @@ protected: bool m_bGoToOptions; Sprite m_sprOptionsMessage; - RageSoundSample m_soundSelect; - RageSoundSample m_soundOptionsChange; + RageSound m_soundSelect; + RageSound m_soundOptionsChange; }; diff --git a/stepmania/src/ScreenSelectDifficulty.cpp b/stepmania/src/ScreenSelectDifficulty.cpp index 55ad2fe16a..226ed4e334 100644 --- a/stepmania/src/ScreenSelectDifficulty.cpp +++ b/stepmania/src/ScreenSelectDifficulty.cpp @@ -171,7 +171,7 @@ ScreenSelectDifficulty::ScreenSelectDifficulty() m_soundSelect.Load( THEME->GetPathTo("Sounds", "menu start") ); m_soundDifficult.Load( ANNOUNCER->GetPathTo("select difficulty challenge") ); - SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select difficulty intro") ); + SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select difficulty intro") ); m_Menu.TweenOnScreenFromMenu( SM_None ); TweenOnScreen(); @@ -402,11 +402,11 @@ void ScreenSelectDifficulty::MenuStart( PlayerNumber pn ) switch( iSelection ) { - case 0: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select difficulty comment easy") ); break; - case 1: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select difficulty comment medium") ); break; - case 2: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select difficulty comment hard") ); break; - case 3: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select difficulty comment oni") ); break; - case 4: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select difficulty comment endless") ); break; + case 0: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select difficulty comment easy") ); break; + case 1: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select difficulty comment medium") ); break; + case 2: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select difficulty comment hard") ); break; + case 3: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select difficulty comment oni") ); break; + case 4: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select difficulty comment endless") ); break; } if( iSelection >= 3 ) // chose something on page 2 diff --git a/stepmania/src/ScreenSelectDifficulty.h b/stepmania/src/ScreenSelectDifficulty.h index 377ed9f646..8f00c0cd51 100644 --- a/stepmania/src/ScreenSelectDifficulty.h +++ b/stepmania/src/ScreenSelectDifficulty.h @@ -61,8 +61,8 @@ private: Sprite m_sprJoinMessagehadow[NUM_PLAYERS]; Sprite m_sprOK[NUM_PLAYERS]; - RageSoundSample m_soundChange; - RageSoundSample m_soundSelect; + RageSound m_soundChange; + RageSound m_soundSelect; RandomSample m_soundDifficult; int m_iSelection[NUM_PLAYERS]; diff --git a/stepmania/src/ScreenSelectGroup.cpp b/stepmania/src/ScreenSelectGroup.cpp index 05c3e9d6c4..b2bc8bd031 100644 --- a/stepmania/src/ScreenSelectGroup.cpp +++ b/stepmania/src/ScreenSelectGroup.cpp @@ -165,7 +165,7 @@ ScreenSelectGroup::ScreenSelectGroup() m_soundChange.Load( THEME->GetPathTo("Sounds","select group change") ); m_soundSelect.Load( THEME->GetPathTo("Sounds","menu start") ); - SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select group intro") ); + SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select group intro") ); SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","select group music") ); @@ -285,9 +285,9 @@ void ScreenSelectGroup::MenuStart( PlayerNumber pn ) GAMESTATE->m_sPreferredGroup = m_GroupList.GetSelectionName(); if( 0 == stricmp(GAMESTATE->m_sPreferredGroup, "All Music") ) - SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select group comment all music") ); + SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select group comment all music") ); else - SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select group comment general") ); + SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select group comment general") ); TweenOffScreen(); diff --git a/stepmania/src/ScreenSelectMode.cpp b/stepmania/src/ScreenSelectMode.cpp index 362ee6333f..6fd147fa25 100644 --- a/stepmania/src/ScreenSelectMode.cpp +++ b/stepmania/src/ScreenSelectMode.cpp @@ -124,7 +124,7 @@ ScreenSelectMode::ScreenSelectMode() m_soundSelect.Load( THEME->GetPathTo("Sounds","menu start") ); m_soundChange.Load( THEME->GetPathTo("Sounds","select style change"), 10 ); - SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select style intro") ); + SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select style intro") ); SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","select style music") ); diff --git a/stepmania/src/ScreenSelectMode.h b/stepmania/src/ScreenSelectMode.h index 2621b749cb..f8c612b4bd 100644 --- a/stepmania/src/ScreenSelectMode.h +++ b/stepmania/src/ScreenSelectMode.h @@ -66,6 +66,6 @@ protected: BGAnimation m_BGAnimations[MAX_MODE_CHOICES]; MenuElements m_Menu; - RageSoundSample m_soundSelect; - RageSoundSample m_soundChange; + RageSound m_soundSelect; + RageSound m_soundChange; }; diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index e56237845b..ffacdb322d 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -231,7 +231,7 @@ ScreenSelectMusic::ScreenSelectMusic() m_soundOptionsChange.Load( THEME->GetPathTo("Sounds","select music change options") ); m_soundLocked.Load( THEME->GetPathTo("Sounds","select music wheel locked") ); - SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select music intro") ); + SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select music intro") ); m_bMadeChoice = false; m_bGoToOptions = false; @@ -430,7 +430,7 @@ void ScreenSelectMusic::Input( const DeviceInput& DeviceI, InputEventType type, { m_bGoToOptions = true; m_sprOptionsMessage.SetState( 1 ); - SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","menu start") ); + SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","menu start") ); return; } @@ -625,11 +625,11 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn ) } if( bIsNew ) - SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select music comment new") ); + SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select music comment new") ); else if( bIsHard ) - SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select music comment hard") ); + SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select music comment hard") ); else - SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select music comment general") ); + SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select music comment general") ); TweenOffScreen(); diff --git a/stepmania/src/ScreenSelectMusic.h b/stepmania/src/ScreenSelectMusic.h index af2e8a7fdd..8789d03d90 100644 --- a/stepmania/src/ScreenSelectMusic.h +++ b/stepmania/src/ScreenSelectMusic.h @@ -82,10 +82,10 @@ protected: Sprite m_sprOptionsMessage; float m_fPlaySampleCountdown; - RageSoundSample m_soundSelect; - RageSoundSample m_soundChangeNotes; - RageSoundSample m_soundOptionsChange; - RageSoundSample m_soundLocked; + RageSound m_soundSelect; + RageSound m_soundChangeNotes; + RageSound m_soundOptionsChange; + RageSound m_soundLocked; }; diff --git a/stepmania/src/ScreenSelectStyle.cpp b/stepmania/src/ScreenSelectStyle.cpp index 36115c7226..77e3fb8c0c 100644 --- a/stepmania/src/ScreenSelectStyle.cpp +++ b/stepmania/src/ScreenSelectStyle.cpp @@ -101,7 +101,7 @@ ScreenSelectStyle::ScreenSelectStyle() m_soundSelect.Load( THEME->GetPathTo("Sounds","menu start") ); - SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select style intro") ); + SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select style intro") ); SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","select style music") ); @@ -242,7 +242,7 @@ void ScreenSelectStyle::MenuStart( PlayerNumber pn ) { if( pn!=PLAYER_INVALID && !GAMESTATE->m_bSideIsJoined[pn] ) { - SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","menu start") ); + SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","menu start") ); GAMESTATE->m_bSideIsJoined[pn] = true; SCREENMAN->RefreshCreditsMessages(); UpdateEnabledDisabled(); @@ -253,11 +253,11 @@ void ScreenSelectStyle::MenuStart( PlayerNumber pn ) CString sCurStyleName = GAMESTATE->GetCurrentStyleDef()->m_szName; sCurStyleName.MakeLower(); - if( -1!=sCurStyleName.Find("single") ) SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select style comment single") ); - else if( -1!=sCurStyleName.Find("versus") ) SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select style comment versus") ); - else if( -1!=sCurStyleName.Find("double") ) SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select style comment double") ); - else if( -1!=sCurStyleName.Find("couple") ) SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select style comment couple") ); - else if( -1!=sCurStyleName.Find("solo") ) SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select style comment solo") ); + if( -1!=sCurStyleName.Find("single") ) SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select style comment single") ); + else if( -1!=sCurStyleName.Find("versus") ) SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select style comment versus") ); + else if( -1!=sCurStyleName.Find("double") ) SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select style comment double") ); + else if( -1!=sCurStyleName.Find("couple") ) SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select style comment couple") ); + else if( -1!=sCurStyleName.Find("solo") ) SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select style comment solo") ); m_Menu.TweenOffScreenToMenu( SM_GoToNextScreen ); GAMESTATE->m_bPlayersCanJoin = false; diff --git a/stepmania/src/ScreenSelectStyle5th.cpp b/stepmania/src/ScreenSelectStyle5th.cpp index 05d42ef9ec..a42efdc52d 100644 --- a/stepmania/src/ScreenSelectStyle5th.cpp +++ b/stepmania/src/ScreenSelectStyle5th.cpp @@ -176,7 +176,7 @@ ScreenSelectStyle5th::ScreenSelectStyle5th() m_soundChange.Load( THEME->GetPathTo("Graphics","select style change") ); m_soundSelect.Load( THEME->GetPathTo("Sounds","menu start") ); - SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select style intro") ); + SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select style intro") ); SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","select style music") ); @@ -276,11 +276,11 @@ void ScreenSelectStyle5th::MenuStart( PlayerNumber pn ) CString sCurStyleName = GAMESTATE->GetCurrentStyleDef()->m_szName; sCurStyleName.MakeLower(); - if( -1!=sCurStyleName.Find("single") ) SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select style comment single") ); - else if( -1!=sCurStyleName.Find("versus") ) SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select style comment versus") ); - else if( -1!=sCurStyleName.Find("double") ) SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select style comment double") ); - else if( -1!=sCurStyleName.Find("couple") ) SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select style comment couple") ); - else if( -1!=sCurStyleName.Find("solo") ) SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select style comment solo") ); + if( -1!=sCurStyleName.Find("single") ) SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select style comment single") ); + else if( -1!=sCurStyleName.Find("versus") ) SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select style comment versus") ); + else if( -1!=sCurStyleName.Find("double") ) SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select style comment double") ); + else if( -1!=sCurStyleName.Find("couple") ) SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select style comment couple") ); + else if( -1!=sCurStyleName.Find("solo") ) SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select style comment solo") ); this->ClearMessageQueue(); diff --git a/stepmania/src/ScreenStage.cpp b/stepmania/src/ScreenStage.cpp index 3b981f99b4..ccd56b106e 100644 --- a/stepmania/src/ScreenStage.cpp +++ b/stepmania/src/ScreenStage.cpp @@ -80,20 +80,20 @@ ScreenStage::ScreenStage() const int iStageNo = GAMESTATE->GetStageIndex()+1; switch( iStageNo ) { - case 1: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("stage 1") ); break; - case 2: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("stage 2") ); break; - case 3: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("stage 3") ); break; - case 4: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("stage 4") ); break; - case 5: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("stage 5") ); break; + case 1: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage 1") ); break; + case 2: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage 2") ); break; + case 3: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage 3") ); break; + case 4: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage 4") ); break; + case 5: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage 5") ); break; default: ; break; // play nothing } } break; - case MODE_FINAL: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("stage final") ); break; - case MODE_EXTRA1: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("stage extra1") ); break; - case MODE_EXTRA2: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("stage extra2") ); break; - case MODE_ONI: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("stage oni") ); break; - case MODE_ENDLESS: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("stage endless") ); break; + case MODE_FINAL: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage final") ); break; + case MODE_EXTRA1: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage extra1") ); break; + case MODE_EXTRA2: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage extra2") ); break; + case MODE_ONI: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage oni") ); break; + case MODE_ENDLESS: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage endless") ); break; default: ASSERT(0); } diff --git a/stepmania/src/ScreenTextEntry.cpp b/stepmania/src/ScreenTextEntry.cpp index 13167e9495..7c2f2b986d 100644 --- a/stepmania/src/ScreenTextEntry.cpp +++ b/stepmania/src/ScreenTextEntry.cpp @@ -60,7 +60,7 @@ ScreenTextEntry::ScreenTextEntry( ScreenMessage SM_SendWhenDone, CString sQuesti m_textAnswer.SetText( m_sAnswer ); this->AddChild( &m_textAnswer ); - SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","menu prompt") ); + SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","menu prompt") ); } void ScreenTextEntry::Update( float fDeltaTime ) @@ -182,7 +182,7 @@ void ScreenTextEntry::MenuStart( PlayerNumber pn ) m_textAnswer.BeginTweening( 0.2f ); m_textAnswer.SetTweenDiffuse( RageColor(1,1,1,0) ); - SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","menu start") ); + SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","menu start") ); if( m_bCancelled ) { if( m_pOnCancel ) m_pOnCancel(); diff --git a/stepmania/src/ScreenTitleMenu.cpp b/stepmania/src/ScreenTitleMenu.cpp index 12375e17ad..3a82c2f18a 100644 --- a/stepmania/src/ScreenTitleMenu.cpp +++ b/stepmania/src/ScreenTitleMenu.cpp @@ -157,7 +157,7 @@ ScreenTitleMenu::ScreenTitleMenu() this->AddChild( &m_Fade ); - SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("title menu game name") ); + SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("title menu game name") ); m_soundAttract.Load( ANNOUNCER->GetPathTo("title menu attract") ); diff --git a/stepmania/src/TransitionBackWipe.h b/stepmania/src/TransitionBackWipe.h index 7c960fb23e..9fc975d436 100644 --- a/stepmania/src/TransitionBackWipe.h +++ b/stepmania/src/TransitionBackWipe.h @@ -34,7 +34,7 @@ public: protected: Quad m_quad; - RageSoundSample m_soundBack; + RageSound m_soundBack; };