diff --git a/stepmania/src/MenuElements.cpp b/stepmania/src/MenuElements.cpp index f82898940d..0683c1f6a6 100644 --- a/stepmania/src/MenuElements.cpp +++ b/stepmania/src/MenuElements.cpp @@ -12,7 +12,6 @@ #include "MenuElements.h" #include "RageUtil.h" -#include "RageSoundManager.h" #include "ScreenManager.h" #include "GameConstantsAndTypes.h" #include "PrefsManager.h" diff --git a/stepmania/src/MenuTimer.cpp b/stepmania/src/MenuTimer.cpp index d1a0882ae6..db0f0822b4 100644 --- a/stepmania/src/MenuTimer.cpp +++ b/stepmania/src/MenuTimer.cpp @@ -18,7 +18,7 @@ #include "AnnouncerManager.h" #include "ThemeManager.h" #include "Font.h" -#include "RageSoundManager.h" +#include "RageSounds.h" const float TIMER_SECONDS = 99; @@ -86,7 +86,7 @@ void MenuTimer::Update( float fDeltaTime ) int iNewDisplay = (int)(fNewSecondsLeft + 0.99f); if( fOldSecondsLeft > 5.5 && fNewSecondsLeft < 5.5 ) // transition to below 5.5 - SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("hurry up") ); + SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("hurry up") ); if( iOldDisplay != iNewDisplay ) { diff --git a/stepmania/src/ModeSwitcher.cpp b/stepmania/src/ModeSwitcher.cpp index 05a931b0f3..f88c55b0d8 100644 --- a/stepmania/src/ModeSwitcher.cpp +++ b/stepmania/src/ModeSwitcher.cpp @@ -16,7 +16,6 @@ #include "PrefsManager.h" #include "SongManager.h" #include "ThemeManager.h" -#include "RageSoundManager.h" #include "StyleDef.h" #include "song.h" #include "ActorUtil.h" diff --git a/stepmania/src/MusicBannerWheel.cpp b/stepmania/src/MusicBannerWheel.cpp index d89db030b2..a2dab4fa3c 100644 --- a/stepmania/src/MusicBannerWheel.cpp +++ b/stepmania/src/MusicBannerWheel.cpp @@ -25,7 +25,7 @@ TODO: #include "PrefsManager.h" #include "SongManager.h" #include "ThemeManager.h" -#include "RageSoundManager.h" +#include "RageSounds.h" #include "StyleDef.h" #include "song.h" #include "ActorUtil.h" @@ -301,7 +301,7 @@ void MusicBannerWheel::PlayMusicSample() Song* pSong = GetSelectedSong(); if( pSong && pSong->HasMusic() ) { - SOUNDMAN->PlayMusic(pSong->GetMusicPath(), true, + SOUND->PlayMusic(pSong->GetMusicPath(), true, pSong->m_fMusicSampleStartSeconds, pSong->m_fMusicSampleLengthSeconds); } diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp index 75103b55ec..ea9c13e7fb 100644 --- a/stepmania/src/MusicWheel.cpp +++ b/stepmania/src/MusicWheel.cpp @@ -17,7 +17,6 @@ #include "SongManager.h" #include "GameManager.h" #include "PrefsManager.h" -#include "RageSoundManager.h" #include "ScreenManager.h" // for sending SM_PlayMusicSample #include "RageLog.h" #include "GameConstantsAndTypes.h" diff --git a/stepmania/src/MusicWheelItem.cpp b/stepmania/src/MusicWheelItem.cpp index 368c011f84..2556125c36 100644 --- a/stepmania/src/MusicWheelItem.cpp +++ b/stepmania/src/MusicWheelItem.cpp @@ -17,7 +17,6 @@ #include "SongManager.h" #include "GameManager.h" #include "PrefsManager.h" -#include "RageSoundManager.h" #include "ScreenManager.h" // for sending SM_PlayMusicSample #include "RageLog.h" #include "GameConstantsAndTypes.h" diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 42885cce7d..ceb4f4ce0a 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -38,7 +38,7 @@ #include "ActorUtil.h" #include "NoteSkinManager.h" #include "RageTextureManager.h" -#include "RageSoundManager.h" +#include "RageSounds.h" #include "CombinedLifeMeterEnemy.h" #include "CombinedLifeMeterTug.h" #include "Inventory.h" @@ -895,7 +895,7 @@ bool ScreenGameplay::IsTimeToPlayTicks() const // will start coming out the speaker. Compensate for this by boosting // fPositionSeconds ahead float fPositionSeconds = GAMESTATE->m_fMusicSeconds; - fPositionSeconds += (SOUNDMAN->GetPlayLatency()+(float)G_TICK_EARLY_SECONDS) * m_soundMusic.GetPlaybackRate(); + fPositionSeconds += (SOUND->GetPlayLatency()+(float)G_TICK_EARLY_SECONDS) * m_soundMusic.GetPlaybackRate(); float fSongBeat = GAMESTATE->m_pCurSong->GetBeatFromElapsedTime( fPositionSeconds ); int iRowNow = BeatToNoteRowNotRounded( fSongBeat ); @@ -935,7 +935,7 @@ void ScreenGameplay::Update( float fDeltaTime ) if( m_bFirstUpdate ) { - SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("gameplay intro") ); // crowd cheer + SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("gameplay intro") ); // crowd cheer // // Get the transitions rolling @@ -1217,7 +1217,7 @@ void ScreenGameplay::Input( const DeviceInput& DeviceI, const InputEventType typ (DeviceI.device!=DEVICE_KEYBOARD && type==IET_FAST_REPEAT) ) { m_DancingState = STATE_OUTRO; - SOUNDMAN->PlayOnce( THEME->GetPathToS("Common back") ); + SOUND->PlayOnce( THEME->GetPathToS("Common 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 @@ -1575,7 +1575,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM ) { TweenOffScreen(); m_Extra.StartTransitioning( SM_GoToStateAfterCleared ); - SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("gameplay extra") ); + SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("gameplay extra") ); } else { @@ -1603,7 +1603,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM ) break; } - SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("gameplay cleared") ); + SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("gameplay cleared") ); } } } @@ -1802,7 +1802,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM ) SET_XY( m_textSurviveTime ); } - SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("gameplay failed") ); + SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("gameplay failed") ); break; case SM_GoToScreenAfterFail: diff --git a/stepmania/src/ScreenGameplayOptions.cpp b/stepmania/src/ScreenGameplayOptions.cpp index ee53ad5ff7..95f601b13d 100644 --- a/stepmania/src/ScreenGameplayOptions.cpp +++ b/stepmania/src/ScreenGameplayOptions.cpp @@ -13,7 +13,7 @@ #include "ScreenGameplayOptions.h" #include "RageUtil.h" -#include "RageSoundManager.h" +#include "RageSounds.h" #include "ScreenManager.h" #include "PrefsManager.h" #include "GameConstantsAndTypes.h" @@ -54,7 +54,7 @@ ScreenGameplayOptions::ScreenGameplayOptions() : false, true ); m_Menu.m_MenuTimer.Disable(); - SOUNDMAN->PlayMusic( THEME->GetPathToS("ScreenMachineOptions music") ); + SOUND->PlayMusic( THEME->GetPathToS("ScreenMachineOptions music") ); } void ScreenGameplayOptions::ImportOptions() diff --git a/stepmania/src/ScreenGraphicOptions.cpp b/stepmania/src/ScreenGraphicOptions.cpp index baa666b68a..114badb669 100644 --- a/stepmania/src/ScreenGraphicOptions.cpp +++ b/stepmania/src/ScreenGraphicOptions.cpp @@ -12,7 +12,7 @@ #include "ScreenGraphicOptions.h" #include "RageUtil.h" -#include "RageSoundManager.h" +#include "RageSounds.h" #include "ScreenManager.h" #include "PrefsManager.h" #include "GameConstantsAndTypes.h" @@ -68,7 +68,7 @@ ScreenGraphicOptions::ScreenGraphicOptions() : false, true ); m_Menu.m_MenuTimer.Disable(); - SOUNDMAN->PlayMusic( THEME->GetPathToS("ScreenGraphicOptions music") ); + SOUND->PlayMusic( THEME->GetPathToS("ScreenGraphicOptions music") ); } void ScreenGraphicOptions::ImportOptions() diff --git a/stepmania/src/ScreenInputOptions.cpp b/stepmania/src/ScreenInputOptions.cpp index 4500941220..d5bbb2aa02 100644 --- a/stepmania/src/ScreenInputOptions.cpp +++ b/stepmania/src/ScreenInputOptions.cpp @@ -12,7 +12,7 @@ #include "ScreenInputOptions.h" #include "RageUtil.h" -#include "RageSoundManager.h" +#include "RageSounds.h" #include "ScreenManager.h" #include "PrefsManager.h" #include "GameConstantsAndTypes.h" @@ -57,7 +57,7 @@ ScreenInputOptions::ScreenInputOptions() : false, true ); m_Menu.m_MenuTimer.Disable(); - SOUNDMAN->PlayMusic( THEME->GetPathToS("ScreenInputOptions music") ); + SOUND->PlayMusic( THEME->GetPathToS("ScreenInputOptions music") ); } void ScreenInputOptions::ImportOptions() diff --git a/stepmania/src/ScreenInstructions.cpp b/stepmania/src/ScreenInstructions.cpp index 86e1f834c0..5c49072b4a 100644 --- a/stepmania/src/ScreenInstructions.cpp +++ b/stepmania/src/ScreenInstructions.cpp @@ -12,7 +12,7 @@ #include "ScreenInstructions.h" #include "RageUtil.h" -#include "RageSoundManager.h" +#include "RageSounds.h" #include "ScreenManager.h" #include "GameConstantsAndTypes.h" #include "RageLog.h" @@ -72,7 +72,7 @@ ScreenInstructions::ScreenInstructions() : Screen("ScreenInstructions") m_sprHowToPlay.BeginTweening( 0.6f, Actor::TWEEN_DECELERATE ); m_sprHowToPlay.SetX( CENTER_X ); - SOUNDMAN->PlayMusic( THEME->GetPathToS("ScreenInstructions music") ); + SOUND->PlayMusic( THEME->GetPathToS("ScreenInstructions music") ); } ScreenInstructions::~ScreenInstructions() diff --git a/stepmania/src/ScreenJukebox.cpp b/stepmania/src/ScreenJukebox.cpp index a693a6c7c0..b5e56826ad 100644 --- a/stepmania/src/ScreenJukebox.cpp +++ b/stepmania/src/ScreenJukebox.cpp @@ -18,6 +18,7 @@ #include "StepMania.h" #include "SDL_utils.h" #include "ScreenManager.h" +#include "RageSounds.h" @@ -188,10 +189,10 @@ void ScreenJukebox::Input( const DeviceInput& DeviceI, const InputEventType type // fall through case COIN_HOME: case COIN_FREE: - SOUNDMAN->StopMusic(); + SOUND->StopMusic(); /* We already played the it was a coin was inserted. Don't play it again. */ if( MenuI.button != MENU_BUTTON_COIN ) - SOUNDMAN->PlayOnce( THEME->GetPathToS("Common coin") ); + SOUND->PlayOnce( THEME->GetPathToS("Common coin") ); SDL_Delay( 800 ); // do a little pause, like the arcade does SCREENMAN->SetNewScreen( "ScreenTitleMenu" ); break; diff --git a/stepmania/src/ScreenJukeboxMenu.cpp b/stepmania/src/ScreenJukeboxMenu.cpp index bd0fc7d6c7..f7c4dcb563 100644 --- a/stepmania/src/ScreenJukeboxMenu.cpp +++ b/stepmania/src/ScreenJukeboxMenu.cpp @@ -19,7 +19,7 @@ #include "GameManager.h" #include "RageLog.h" #include "GameState.h" -#include "RageSoundManager.h" +#include "RageSounds.h" #include "ThemeManager.h" #include "ScreenJukebox.h" @@ -55,7 +55,7 @@ ScreenJukeboxMenu::ScreenJukeboxMenu() : Screen("ScreenJukeboxMenu") m_soundInvalid.Load( THEME->GetPathToS("Common invalid") ); - SOUNDMAN->PlayMusic( THEME->GetPathToS("ScreenJukeboxMenu music") ); + SOUND->PlayMusic( THEME->GetPathToS("ScreenJukeboxMenu music") ); } @@ -140,8 +140,8 @@ void ScreenJukeboxMenu::MenuStart( PlayerNumber pn ) } - SOUNDMAN->StopMusic(); - SOUNDMAN->PlayOnce( THEME->GetPathToS("Common start") ); + SOUND->StopMusic(); + SOUND->PlayOnce( THEME->GetPathToS("Common start") ); m_Menu.StartTransitioning( SM_GoToNextScreen ); } @@ -149,5 +149,5 @@ void ScreenJukeboxMenu::MenuBack( PlayerNumber pn ) { m_Menu.StartTransitioning( SM_GoToPrevScreen ); - SOUNDMAN->StopMusic(); + SOUND->StopMusic(); } diff --git a/stepmania/src/ScreenMachineOptions.cpp b/stepmania/src/ScreenMachineOptions.cpp index f720c79b0c..c59f78dd62 100644 --- a/stepmania/src/ScreenMachineOptions.cpp +++ b/stepmania/src/ScreenMachineOptions.cpp @@ -12,7 +12,7 @@ #include "ScreenMachineOptions.h" #include "RageUtil.h" -#include "RageSoundManager.h" +#include "RageSounds.h" #include "ScreenManager.h" #include "PrefsManager.h" #include "GameConstantsAndTypes.h" @@ -63,7 +63,7 @@ ScreenMachineOptions::ScreenMachineOptions() : false, true ); m_Menu.m_MenuTimer.Disable(); - SOUNDMAN->PlayMusic( THEME->GetPathToS("ScreenMachineOptions music") ); + SOUND->PlayMusic( THEME->GetPathToS("ScreenMachineOptions music") ); } void ScreenMachineOptions::ImportOptions() diff --git a/stepmania/src/ScreenMapControllers.cpp b/stepmania/src/ScreenMapControllers.cpp index 2e73e70ff2..b353da034c 100644 --- a/stepmania/src/ScreenMapControllers.cpp +++ b/stepmania/src/ScreenMapControllers.cpp @@ -19,7 +19,7 @@ #include "InputMapper.h" #include "GameManager.h" #include "GameState.h" -#include "RageSoundManager.h" +#include "RageSounds.h" #include "ThemeManager.h" @@ -102,7 +102,7 @@ ScreenMapControllers::ScreenMapControllers() : Screen("ScreenMapControllers") m_Menu.Load( "ScreenMapControllers", false ); // no timer this->AddChild( &m_Menu ); - SOUNDMAN->PlayMusic( THEME->GetPathToS("ScreenMapControllers music") ); + SOUND->PlayMusic( THEME->GetPathToS("ScreenMapControllers music") ); Refresh(); } @@ -150,7 +150,7 @@ void ScreenMapControllers::Input( const DeviceInput& DeviceI, const InputEventTy if ( DeviceI.device == DEVICE_KEYBOARD && (DeviceI.button >= SDLK_F1 && DeviceI.button <= SDLK_F12) ) { m_textError.SetText( "That key can not be mapped." ); - SOUNDMAN->PlayOnce( THEME->GetPathToS("Common invalid" ) ); + SOUND->PlayOnce( THEME->GetPathToS("Common invalid" ) ); m_textError.StopTweening(); m_textError.SetDiffuse( RageColor(0,1,0,1) ); m_textError.BeginTweening( 3 ); @@ -250,7 +250,7 @@ void ScreenMapControllers::Input( const DeviceInput& DeviceI, const InputEventTy case SDLK_ESCAPE: /* Quit the screen. */ if(!m_Menu.IsTransitioning()) { - SOUNDMAN->PlayOnce( THEME->GetPathToS("Common start") ); + SOUND->PlayOnce( THEME->GetPathToS("Common start") ); m_Menu.StartTransitioning( SM_GoToNextScreen ); for( int b=0; bGetCurrentGameDef()->m_iButtonsPerController; b++ ) m_Line[b].Command( (b%2)? ODD_LINE_OUT:EVEN_LINE_OUT ); diff --git a/stepmania/src/ScreenMiniMenu.cpp b/stepmania/src/ScreenMiniMenu.cpp index 01b472180f..f42c224f12 100644 --- a/stepmania/src/ScreenMiniMenu.cpp +++ b/stepmania/src/ScreenMiniMenu.cpp @@ -14,7 +14,7 @@ #include "ScreenMiniMenu.h" #include "PrefsManager.h" #include "ScreenManager.h" -#include "RageSoundManager.h" +#include "RageSounds.h" #include "GameConstantsAndTypes.h" #include "PrefsManager.h" #include "ThemeManager.h" @@ -216,7 +216,7 @@ void ScreenMiniMenu::MenuStart( PlayerNumber pn ) { m_Out.StartTransitioning( SM_GoToOK ); - SOUNDMAN->PlayOnce( THEME->GetPathToS("Common start") ); + SOUND->PlayOnce( THEME->GetPathToS("Common start") ); s_iLastLine = m_iCurLine; COPY( s_iLastAnswers, m_iCurAnswers ); @@ -233,7 +233,7 @@ void ScreenMiniMenu::BeforeLineChanged() m_textAnswer[m_iCurLine].SetEffectNone(); m_textLabel[m_iCurLine].SetZoom( ZOOM_NOT_SELECTED ); m_textAnswer[m_iCurLine].SetZoom( ZOOM_NOT_SELECTED ); - SOUNDMAN->PlayOnce( THEME->GetPathToS("ScreenMiniMenu row") ); + SOUND->PlayOnce( THEME->GetPathToS("ScreenMiniMenu row") ); } void ScreenMiniMenu::AfterLineChanged() @@ -246,7 +246,7 @@ void ScreenMiniMenu::AfterLineChanged() void ScreenMiniMenu::AfterAnswerChanged() { - SOUNDMAN->PlayOnce( THEME->GetPathToS("ScreenMiniMenu row") ); + SOUND->PlayOnce( THEME->GetPathToS("ScreenMiniMenu row") ); int iAnswerInRow = m_iCurAnswers[m_iCurLine]; CString sAnswerText = m_Def.rows[m_iCurLine].choices[iAnswerInRow]; m_textAnswer[m_iCurLine].SetText( sAnswerText ); diff --git a/stepmania/src/ScreenMusicScroll.cpp b/stepmania/src/ScreenMusicScroll.cpp index 50cf118c82..aa04af9fa7 100644 --- a/stepmania/src/ScreenMusicScroll.cpp +++ b/stepmania/src/ScreenMusicScroll.cpp @@ -18,6 +18,7 @@ #include "RageLog.h" #include "GameConstantsAndTypes.h" #include "SongManager.h" +#include "RageSounds.h" #include "GameState.h" #include "ThemeManager.h" #include "AnnouncerManager.h" @@ -90,9 +91,9 @@ ScreenMusicScroll::ScreenMusicScroll() : Screen("ScreenMusicScroll") m_Out.Load( THEME->GetPathToB("ScreenMusicScroll out") ); // this->AddChild( &m_Out ); // draw and update manually - SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("music scroll") ); + SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("music scroll") ); - SOUNDMAN->PlayMusic( THEME->GetPathToS("ScreenMusicScroll music") ); + SOUND->PlayMusic( THEME->GetPathToS("ScreenMusicScroll music") ); } diff --git a/stepmania/src/ScreenNameEntry.cpp b/stepmania/src/ScreenNameEntry.cpp index 224831c110..c3c5727f19 100644 --- a/stepmania/src/ScreenNameEntry.cpp +++ b/stepmania/src/ScreenNameEntry.cpp @@ -19,7 +19,7 @@ #include "GameManager.h" #include "RageLog.h" #include "GameState.h" -#include "RageSoundManager.h" +#include "RageSounds.h" #include "ThemeManager.h" #include "ScreenRanking.h" #include "Course.h" @@ -249,7 +249,7 @@ ScreenNameEntry::ScreenNameEntry() : Screen("ScreenNameEntry") m_soundStep.Load( THEME->GetPathToS("ScreenNameEntry step") ); - SOUNDMAN->PlayMusic( THEME->GetPathToS("ScreenNameEntry music") ); + SOUND->PlayMusic( THEME->GetPathToS("ScreenNameEntry music") ); m_fFakeBeat = 0; } diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp index a4ec53e3c7..4bfcfc909b 100644 --- a/stepmania/src/ScreenOptions.cpp +++ b/stepmania/src/ScreenOptions.cpp @@ -13,7 +13,6 @@ #include "ScreenOptions.h" #include "RageUtil.h" -#include "RageSoundManager.h" #include "ScreenManager.h" #include "PrefsManager.h" #include "GameConstantsAndTypes.h" diff --git a/stepmania/src/ScreenOptionsMenu.cpp b/stepmania/src/ScreenOptionsMenu.cpp index 49b491fca3..7367fd347f 100644 --- a/stepmania/src/ScreenOptionsMenu.cpp +++ b/stepmania/src/ScreenOptionsMenu.cpp @@ -12,7 +12,7 @@ #include "ScreenOptionsMenu.h" #include "RageUtil.h" -#include "RageSoundManager.h" +#include "RageSounds.h" #include "ScreenManager.h" #include "PrefsManager.h" #include "GameConstantsAndTypes.h" @@ -68,7 +68,7 @@ ScreenOptionsMenu::ScreenOptionsMenu() : false, true ); m_Menu.m_MenuTimer.Disable(); - SOUNDMAN->PlayMusic( THEME->GetPathToS("ScreenOptionsMenu music") ); + SOUND->PlayMusic( THEME->GetPathToS("ScreenOptionsMenu music") ); } /* We depend on the SM options navigation for this screen, not arcade. */ diff --git a/stepmania/src/ScreenPlayerOptions.cpp b/stepmania/src/ScreenPlayerOptions.cpp index af0b16c50e..f578697c1a 100644 --- a/stepmania/src/ScreenPlayerOptions.cpp +++ b/stepmania/src/ScreenPlayerOptions.cpp @@ -17,6 +17,7 @@ #include "GameState.h" #include "ThemeManager.h" #include "AnnouncerManager.h" +#include "RageSounds.h" #include "NoteSkinManager.h" #include "NoteFieldPositioning.h" #include "ScreenSongOptions.h" @@ -97,7 +98,7 @@ ScreenPlayerOptions::ScreenPlayerOptions() : m_bAcceptedChoices = false; m_bGoToOptions = ( PREFSMAN->m_ShowSongOptions == PrefsManager::YES ); - SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("player options intro") ); + SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("player options intro") ); } @@ -399,7 +400,7 @@ void ScreenPlayerOptions::Input( const DeviceInput& DeviceI, const InputEventTyp { m_bGoToOptions = true; m_sprOptionsMessage.SetState( 1 ); - SOUNDMAN->PlayOnce( THEME->GetPathToS("Common start") ); + SOUND->PlayOnce( THEME->GetPathToS("Common start") ); } } diff --git a/stepmania/src/ScreenPrompt.cpp b/stepmania/src/ScreenPrompt.cpp index 6a68e49497..604a93e0e6 100644 --- a/stepmania/src/ScreenPrompt.cpp +++ b/stepmania/src/ScreenPrompt.cpp @@ -14,7 +14,7 @@ #include "ScreenPrompt.h" #include "PrefsManager.h" #include "ScreenManager.h" -#include "RageSoundManager.h" +#include "RageSounds.h" #include "GameConstantsAndTypes.h" #include "PrefsManager.h" #include "ThemeManager.h" @@ -154,7 +154,7 @@ void ScreenPrompt::MenuRight( PlayerNumber pn ) m_rectAnswerBox.SetXY( m_textAnswer[m_bAnswer].GetX(), m_textAnswer[m_bAnswer].GetY() ); m_rectAnswerBox.SetZoomX( m_textAnswer[m_bAnswer].GetWidestLineWidthInSourcePixels()+10.0f ); - SOUNDMAN->PlayOnce( THEME->GetPathToS("ScreenPrompt change") ); + SOUND->PlayOnce( THEME->GetPathToS("ScreenPrompt change") ); } void ScreenPrompt::MenuStart( PlayerNumber pn ) @@ -174,7 +174,7 @@ void ScreenPrompt::MenuStart( PlayerNumber pn ) m_textAnswer[1].BeginTweening( 0.2f ); m_textAnswer[1].SetDiffuse( RageColor(1,1,1,0) ); - SOUNDMAN->PlayOnce( THEME->GetPathToS("Common start") ); + SOUND->PlayOnce( THEME->GetPathToS("Common start") ); if( m_bAnswer ) { diff --git a/stepmania/src/ScreenRaveOptions.cpp b/stepmania/src/ScreenRaveOptions.cpp index 1d238682cf..62b1e1b4b7 100644 --- a/stepmania/src/ScreenRaveOptions.cpp +++ b/stepmania/src/ScreenRaveOptions.cpp @@ -13,7 +13,6 @@ #include "ScreenRaveOptions.h" #include "RageUtil.h" -#include "RageSoundManager.h" #include "ScreenManager.h" #include "PrefsManager.h" #include "GameConstantsAndTypes.h" diff --git a/stepmania/src/ScreenSelect.cpp b/stepmania/src/ScreenSelect.cpp index b0c4f1a106..2445d723e3 100644 --- a/stepmania/src/ScreenSelect.cpp +++ b/stepmania/src/ScreenSelect.cpp @@ -14,7 +14,7 @@ #include "ScreenSelect.h" #include "ScreenManager.h" #include "PrefsManager.h" -#include "RageSoundManager.h" +#include "RageSounds.h" #include "GameConstantsAndTypes.h" #include "PrefsManager.h" #include "GameManager.h" @@ -83,8 +83,8 @@ void ScreenSelect::Update( float fDelta ) if(m_bFirstUpdate) { /* Don't play sounds during the ctor, since derived classes havn't loaded yet. */ - SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo(m_sName+" intro") ); - SOUNDMAN->PlayMusic( THEME->GetPathToS(m_sName+" music") ); + SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo(m_sName+" intro") ); + SOUND->PlayMusic( THEME->GetPathToS(m_sName+" music") ); } Screen::Update( fDelta ); @@ -149,7 +149,7 @@ void ScreenSelect::Input( const DeviceInput& DeviceI, const InputEventType type, } /* If credits had to be used, it's already taken care of.. add the player */ - SOUNDMAN->PlayOnce( THEME->GetPathToS("Common start") ); + SOUND->PlayOnce( THEME->GetPathToS("Common start") ); GAMESTATE->m_bSideIsJoined[pn] = true; SCREENMAN->RefreshCreditsMessages(); this->UpdateSelectableChoices(); @@ -193,7 +193,7 @@ void ScreenSelect::HandleScreenMessage( const ScreenMessage SM ) } break; case SM_GoToPrevScreen: - SOUNDMAN->StopMusic(); + SOUND->StopMusic(); SCREENMAN->SetNewScreen( "ScreenTitleMenu" ); break; case SM_GoToNextScreen: @@ -207,7 +207,7 @@ void ScreenSelect::HandleScreenMessage( const ScreenMessage SM ) void ScreenSelect::MenuBack( PlayerNumber pn ) { - SOUNDMAN->StopMusic(); + SOUND->StopMusic(); m_Menu.Back( SM_GoToPrevScreen ); } diff --git a/stepmania/src/ScreenSelectCharacter.cpp b/stepmania/src/ScreenSelectCharacter.cpp index aa4be55fed..f5e9136bc7 100644 --- a/stepmania/src/ScreenSelectCharacter.cpp +++ b/stepmania/src/ScreenSelectCharacter.cpp @@ -13,6 +13,7 @@ #include "ScreenSelectCharacter.h" #include "ScreenManager.h" +#include "RageSounds.h" #include "RageUtil.h" #include "RageLog.h" #include "ThemeManager.h" @@ -111,9 +112,9 @@ ScreenSelectCharacter::ScreenSelectCharacter() : Screen("ScreenSelectCharacter") m_soundChange.Load( THEME->GetPathToS("ScreenSelectCharacter change") ); m_soundSelect.Load( THEME->GetPathToS("Common start") ); - SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select group intro") ); + SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select group intro") ); - SOUNDMAN->PlayMusic( THEME->GetPathToS("ScreenSelectCharacter music") ); + SOUND->PlayMusic( THEME->GetPathToS("ScreenSelectCharacter music") ); for( p=0; pPlayMusic( THEME->GetPathToS("ScreenSelectCourse music") ); + SOUND->PlayMusic( THEME->GetPathToS("ScreenSelectCourse music") ); m_bMadeChoice = false; m_bGoToOptions = false; @@ -128,9 +128,9 @@ ScreenSelectCourse::ScreenSelectCourse() : Screen("ScreenSelectCourse") m_soundChangeNotes.Load( THEME->GetPathToS("ScreenSelectCourse difficulty") ); - SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select course intro") ); + SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select course intro") ); - SOUNDMAN->PlayMusic( THEME->GetPathToS("ScreenSelectCourse music") ); + SOUND->PlayMusic( THEME->GetPathToS("ScreenSelectCourse music") ); UpdateOptionsDisplays(); @@ -332,7 +332,7 @@ void ScreenSelectCourse::MenuStart( PlayerNumber pn ) switch( m_MusicWheel.GetSelectedType() ) { case TYPE_COURSE: - SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select course comment general") ); + SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select course comment general") ); TweenOffScreen(); @@ -392,7 +392,7 @@ void ScreenSelectCourse::MenuStart( PlayerNumber pn ) void ScreenSelectCourse::MenuBack( PlayerNumber pn ) { - SOUNDMAN->StopMusic(); + SOUND->StopMusic(); m_Menu.Back( SM_GoToPrevScreen ); } diff --git a/stepmania/src/ScreenSelectDifficulty.cpp b/stepmania/src/ScreenSelectDifficulty.cpp index bc84a0ee3d..cf30b9ba29 100644 --- a/stepmania/src/ScreenSelectDifficulty.cpp +++ b/stepmania/src/ScreenSelectDifficulty.cpp @@ -13,6 +13,7 @@ #include "ScreenSelectDifficulty.h" #include "ScreenManager.h" #include "PrefsManager.h" +#include "RageSounds.h" #include "GameManager.h" #include "ThemeManager.h" #include "GameState.h" @@ -301,7 +302,7 @@ void ScreenSelectDifficulty::MenuStart( PlayerNumber pn ) if(m_CurrentPage != PAGE_2 || !AnotherPlayerSelected) { - SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo(ssprintf("ScreenSelectDifficulty comment %s",mc.name)) ); + SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo(ssprintf("ScreenSelectDifficulty comment %s",mc.name)) ); m_soundSelect.Play(); } diff --git a/stepmania/src/ScreenSelectDifficultyEX.cpp b/stepmania/src/ScreenSelectDifficultyEX.cpp index 562eb62faf..6e61d74719 100644 --- a/stepmania/src/ScreenSelectDifficultyEX.cpp +++ b/stepmania/src/ScreenSelectDifficultyEX.cpp @@ -16,6 +16,7 @@ #include "ModeChoice.h" #include "PrefsManager.h" #include "RageLog.h" +#include "RageSounds.h" #include "ScreenManager.h" #include "ScreenSelectDifficultyEX.h" #include "ThemeManager.h" @@ -383,7 +384,7 @@ void ScreenSelectDifficultyEX::MenuStart( PlayerNumber pn ) m_sprDifficulty[e].SetDiffuse( RageColor(.5,.5,.5,1) ); } } - SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo(ssprintf("ScreenSelectDifficulty comment %s",mc.name)) ); + SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo(ssprintf("ScreenSelectDifficulty comment %s",mc.name)) ); m_soundSelect.Play(); } diff --git a/stepmania/src/ScreenSelectGame.cpp b/stepmania/src/ScreenSelectGame.cpp index 83b28dcab2..6a460b3239 100644 --- a/stepmania/src/ScreenSelectGame.cpp +++ b/stepmania/src/ScreenSelectGame.cpp @@ -10,7 +10,7 @@ */ #include "ScreenSelectGame.h" -#include "RageSoundManager.h" +#include "RageSounds.h" #include "ScreenManager.h" #include "PrefsManager.h" #include "RageLog.h" @@ -58,7 +58,7 @@ ScreenSelectGame::ScreenSelectGame() : false, true ); m_Menu.m_MenuTimer.Disable(); - SOUNDMAN->PlayMusic( THEME->GetPathToS("ScreenSelectGame music") ); + SOUND->PlayMusic( THEME->GetPathToS("ScreenSelectGame music") ); } void ScreenSelectGame::ImportOptions() diff --git a/stepmania/src/ScreenSelectGroup.cpp b/stepmania/src/ScreenSelectGroup.cpp index 2fd279c82e..750edf24e3 100644 --- a/stepmania/src/ScreenSelectGroup.cpp +++ b/stepmania/src/ScreenSelectGroup.cpp @@ -20,7 +20,7 @@ #include "SongManager.h" #include "AnnouncerManager.h" #include "GameState.h" -#include "RageSoundManager.h" +#include "RageSounds.h" #include "ThemeManager.h" #include #include "ActorUtil.h" @@ -139,9 +139,9 @@ ScreenSelectGroup::ScreenSelectGroup() : Screen("ScreenSelectGroup") m_soundChange.Load( THEME->GetPathToS("ScreenSelectGroup change") ); m_soundSelect.Load( THEME->GetPathToS("Common start") ); - SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select group intro") ); + SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select group intro") ); - SOUNDMAN->PlayMusic( THEME->GetPathToS("ScreenSelectGroup music") ); + SOUND->PlayMusic( THEME->GetPathToS("ScreenSelectGroup music") ); AfterChange(); TweenOnScreen(); @@ -256,9 +256,9 @@ void ScreenSelectGroup::MenuStart( PlayerNumber pn ) GAMESTATE->m_sPreferredGroup = (m_GroupList.GetSelectionName()=="ALL MUSIC" ? GROUP_ALL_MUSIC : m_GroupList.GetSelectionName() ); if( GAMESTATE->m_sPreferredGroup == GROUP_ALL_MUSIC ) - SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select group comment all music") ); + SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select group comment all music") ); else - SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select group comment general") ); + SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select group comment general") ); TweenOffScreen(); diff --git a/stepmania/src/ScreenSelectMaster.cpp b/stepmania/src/ScreenSelectMaster.cpp index d6d04aec70..cfc39d4007 100644 --- a/stepmania/src/ScreenSelectMaster.cpp +++ b/stepmania/src/ScreenSelectMaster.cpp @@ -15,6 +15,7 @@ #include "PrefsManager.h" #include "GameManager.h" #include "ThemeManager.h" +#include "RageSounds.h" #include "GameState.h" #include "AnnouncerManager.h" #include "ModeChoice.h" @@ -410,7 +411,7 @@ void ScreenSelectMaster::MenuStart( PlayerNumber pn ) if(GetCurrentPage() != PAGE_2 || !AnotherPlayerSelected) { - SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo(ssprintf("ScreenSelectMaster comment %s",mc.name)) ); + SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo(ssprintf("ScreenSelectMaster comment %s",mc.name)) ); m_soundSelect.Play(); } diff --git a/stepmania/src/ScreenSelectMode.cpp b/stepmania/src/ScreenSelectMode.cpp index 9431fb8898..5990d2cb25 100644 --- a/stepmania/src/ScreenSelectMode.cpp +++ b/stepmania/src/ScreenSelectMode.cpp @@ -12,7 +12,6 @@ Chris Danford #include "ScreenSelectMode.h" #include "ScreenManager.h" #include "PrefsManager.h" -#include "RageSoundManager.h" #include "GameConstantsAndTypes.h" #include "PrefsManager.h" #include "GameManager.h" diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index a0ab41c699..278770cf38 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -16,7 +16,7 @@ #include "PrefsManager.h" #include "SongManager.h" #include "GameManager.h" -#include "RageSoundManager.h" +#include "RageSounds.h" #include "GameConstantsAndTypes.h" #include "PrefsManager.h" #include "RageLog.h" @@ -240,7 +240,7 @@ ScreenSelectMusic::ScreenSelectMusic() : Screen("ScreenSelectMusic") m_soundOptionsChange.Load( THEME->GetPathToS("ScreenSelectMusic options") ); m_soundLocked.Load( THEME->GetPathToS("ScreenSelectMusic locked") ); - SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select music intro") ); + SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select music intro") ); m_bMadeChoice = false; m_bGoToOptions = false; @@ -501,7 +501,7 @@ void ScreenSelectMusic::Update( float fDeltaTime ) { if( !m_sSampleMusicToPlay.empty() ) { - SOUNDMAN->PlayMusic( + SOUND->PlayMusic( m_sSampleMusicToPlay, true, m_fSampleStartSeconds, @@ -561,7 +561,7 @@ void ScreenSelectMusic::Input( const DeviceInput& DeviceI, InputEventType type, m_bGoToOptions = true; m_sprOptionsMessage.SetState( 1 ); - SOUNDMAN->PlayOnce( THEME->GetPathToS("Common start") ); + SOUND->PlayOnce( THEME->GetPathToS("Common start") ); return; } @@ -710,7 +710,7 @@ void ScreenSelectMusic::HandleScreenMessage( const ScreenMessage SM ) else { GAMESTATE->AdjustFailType(); - SOUNDMAN->StopMusic(); + SOUND->StopMusic(); SCREENMAN->SetNewScreen( NEXT_SCREEN(GAMESTATE->m_PlayMode) ); } break; @@ -765,11 +765,11 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn ) } if( bIsNew ) - SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select music comment new") ); + SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select music comment new") ); else if( bIsHard ) - SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select music comment hard") ); + SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select music comment hard") ); else - SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select music comment general") ); + SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select music comment general") ); m_bMadeChoice = true; @@ -782,7 +782,7 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn ) } case TYPE_COURSE: { - SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select course comment general") ); + SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select course comment general") ); Course *pCourse = m_MusicWheel.GetSelectedCourse(); ASSERT( pCourse ); @@ -852,7 +852,7 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn ) void ScreenSelectMusic::MenuBack( PlayerNumber pn ) { - SOUNDMAN->StopMusic(); + SOUND->StopMusic(); m_Menu.Back( SM_GoToPrevScreen ); } @@ -1079,10 +1079,10 @@ void ScreenSelectMusic::AfterMusicChange() // Don't stop music if it's already playing the right file. if( SampleMusicToPlay == "" ) - SOUNDMAN->StopMusic(); - else if( SOUNDMAN->GetMusicPath() != SampleMusicToPlay ) + SOUND->StopMusic(); + else if( SOUND->GetMusicPath() != SampleMusicToPlay ) { - SOUNDMAN->StopMusic(); + SOUND->StopMusic(); m_sSampleMusicToPlay = SampleMusicToPlay; m_fPlaySampleCountdown = SAMPLE_MUSIC_DELAY; } diff --git a/stepmania/src/ScreenSelectStyle.cpp b/stepmania/src/ScreenSelectStyle.cpp index b19f6d3364..d7c7570f69 100644 --- a/stepmania/src/ScreenSelectStyle.cpp +++ b/stepmania/src/ScreenSelectStyle.cpp @@ -12,6 +12,7 @@ #include "ScreenSelectStyle.h" #include "GameManager.h" +#include "RageSounds.h" #include "ThemeManager.h" #include "PrefsManager.h" #include "ScreenManager.h" @@ -181,7 +182,7 @@ void ScreenSelectStyle::MenuStart( PlayerNumber pn ) SCREENMAN->PostMessageToTopScreen( SM_AllDoneChoosing, 0 ); const ModeChoice& mc = m_aModeChoices[GetSelectionIndex(pn)]; - SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo(ssprintf("ScreenSelectStyle comment %s",mc.name)) ); + SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo(ssprintf("ScreenSelectStyle comment %s",mc.name)) ); // // TweenOffScreen diff --git a/stepmania/src/ScreenSelectStyle5th.cpp b/stepmania/src/ScreenSelectStyle5th.cpp index 58cb9fefca..2579614d4e 100644 --- a/stepmania/src/ScreenSelectStyle5th.cpp +++ b/stepmania/src/ScreenSelectStyle5th.cpp @@ -14,7 +14,7 @@ #include "ScreenSelectStyle5th.h" #include "ScreenManager.h" #include "PrefsManager.h" -#include "RageSoundManager.h" +#include "RageSounds.h" #include "GameConstantsAndTypes.h" #include "PrefsManager.h" #include "GameManager.h" @@ -186,9 +186,9 @@ ScreenSelectStyle5th::ScreenSelectStyle5th() : Screen("ScreenSelectStyle5th") m_soundChange.Load( THEME->GetPathToG("ScreenSelectStyle5th change") ); m_soundSelect.Load( THEME->GetPathToS("Common start") ); - SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select style intro") ); + SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select style intro") ); - SOUNDMAN->PlayMusic( THEME->GetPathToS("ScreenSelectStyle5th music") ); + SOUND->PlayMusic( THEME->GetPathToS("ScreenSelectStyle5th music") ); m_soundChange.PlayRandom(); TweenOnScreen(); @@ -228,7 +228,7 @@ void ScreenSelectStyle5th::HandleScreenMessage( const ScreenMessage SM ) MenuStart(PLAYER_1); break; case SM_GoToPrevScreen: - SOUNDMAN->StopMusic(); + SOUND->StopMusic(); SCREENMAN->SetNewScreen( "ScreenTitleMenu" ); break; case SM_GoToNextScreen: @@ -285,11 +285,11 @@ void ScreenSelectStyle5th::MenuStart( PlayerNumber pn ) CString sCurStyleName = GAMESTATE->GetCurrentStyleDef()->m_szName; sCurStyleName.MakeLower(); - if( -1!=sCurStyleName.Find("single") ) SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("ScreenSelectStyle5th comment single") ); - else if( -1!=sCurStyleName.Find("versus") ) SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("ScreenSelectStyle5th 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") ); + if( -1!=sCurStyleName.Find("single") ) SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("ScreenSelectStyle5th comment single") ); + else if( -1!=sCurStyleName.Find("versus") ) SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("ScreenSelectStyle5th comment versus") ); + else if( -1!=sCurStyleName.Find("double") ) SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select style comment double") ); + else if( -1!=sCurStyleName.Find("couple") ) SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select style comment couple") ); + else if( -1!=sCurStyleName.Find("solo") ) SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select style comment solo") ); this->ClearMessageQueue(); @@ -300,7 +300,7 @@ void ScreenSelectStyle5th::MenuStart( PlayerNumber pn ) void ScreenSelectStyle5th::MenuBack( PlayerNumber pn ) { - SOUNDMAN->StopMusic(); + SOUND->StopMusic(); m_Menu.Back( SM_GoToPrevScreen ); } diff --git a/stepmania/src/ScreenSongOptions.cpp b/stepmania/src/ScreenSongOptions.cpp index 2eb967dbcd..f7df84fa98 100644 --- a/stepmania/src/ScreenSongOptions.cpp +++ b/stepmania/src/ScreenSongOptions.cpp @@ -12,7 +12,6 @@ #include "ScreenSongOptions.h" #include "RageUtil.h" -#include "RageSoundManager.h" #include "ScreenManager.h" #include "GameConstantsAndTypes.h" #include "RageLog.h" diff --git a/stepmania/src/ScreenSoundOptions.cpp b/stepmania/src/ScreenSoundOptions.cpp index 4fbdb18fe7..661bfac674 100644 --- a/stepmania/src/ScreenSoundOptions.cpp +++ b/stepmania/src/ScreenSoundOptions.cpp @@ -14,6 +14,7 @@ #include "ScreenSoundOptions.h" #include "RageUtil.h" #include "RageSoundManager.h" +#include "RageSounds.h" #include "ScreenManager.h" #include "PrefsManager.h" #include "GameConstantsAndTypes.h" @@ -46,7 +47,7 @@ ScreenSoundOptions::ScreenSoundOptions() : Init( INPUTMODE_BOTH, g_SoundOptionsLines, NUM_SOUND_OPTIONS_LINES, false, true ); m_Menu.m_MenuTimer.Disable(); - SOUNDMAN->PlayMusic( THEME->GetPathToS("ScreenSoundOptions music") ); + SOUND->PlayMusic( THEME->GetPathToS("ScreenSoundOptions music") ); } void ScreenSoundOptions::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI ) diff --git a/stepmania/src/ScreenStage.cpp b/stepmania/src/ScreenStage.cpp index 1537460cc5..78c56ad764 100644 --- a/stepmania/src/ScreenStage.cpp +++ b/stepmania/src/ScreenStage.cpp @@ -20,7 +20,7 @@ #include "Sprite.h" #include "AnnouncerManager.h" #include "GameState.h" -#include "RageSoundManager.h" +#include "RageSounds.h" #include "ThemeManager.h" @@ -54,7 +54,7 @@ enum StageMode ScreenStage::ScreenStage() : Screen("ScreenStage") { - SOUNDMAN->StopMusic(); + SOUND->StopMusic(); m_Background.LoadFromAniDir( THEME->GetPathToB("ScreenStage "+GAMESTATE->GetStageText()) ); this->AddChild( &m_Background ); @@ -98,7 +98,7 @@ ScreenStage::ScreenStage() : Screen("ScreenStage") //else stage_mode = MODE_NORMAL; - SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage "+GAMESTATE->GetStageText()) ); + SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage "+GAMESTATE->GetStageText()) ); // switch( stage_mode ) // { @@ -108,21 +108,21 @@ ScreenStage::ScreenStage() : Screen("ScreenStage") // switch( iStageNo ) // { // case 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; -// case 6: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage 6") ); break; +// case 2: SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage 2") ); break; +// case 3: SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage 3") ); break; +// case 4: SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage 4") ); break; +// case 5: SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage 5") ); break; +// case 6: SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage 6") ); break; // default: ; break; // play nothing // } // } // 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_NONSTOP: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage nonstop") ); break; -// case MODE_ONI: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage oni") ); break; -// case MODE_ENDLESS: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage endless") ); break; +// case MODE_FINAL: SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage final") ); break; +// case MODE_EXTRA1: SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage extra1") ); break; +// case MODE_EXTRA2: SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage extra2") ); break; +// case MODE_NONSTOP: SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage nonstop") ); break; +// case MODE_ONI: SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage oni") ); break; +// case MODE_ENDLESS: SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage endless") ); break; // default: ASSERT(0); // } // diff --git a/stepmania/src/ScreenStyleSplash.cpp b/stepmania/src/ScreenStyleSplash.cpp index 0cfdb2707c..b1969acc1a 100644 --- a/stepmania/src/ScreenStyleSplash.cpp +++ b/stepmania/src/ScreenStyleSplash.cpp @@ -13,7 +13,7 @@ #include "ScreenStyleSplash.h" #include "GameConstantsAndTypes.h" #include "PrefsManager.h" -#include "RageSoundManager.h" +#include "RageSounds.h" #include "ScreenManager.h" #include "ThemeManager.h" #include "GameState.h" @@ -30,7 +30,7 @@ const ScreenMessage SM_StartClosing = ScreenMessage(SM_User-8); ScreenStyleSplash::ScreenStyleSplash() : Screen("ScreenStyleSplash") { - SOUNDMAN->StopMusic(); + SOUND->StopMusic(); CString sGameName = GAMESTATE->GetCurrentGameDef()->m_szName; CString sStyleName = GAMESTATE->GetCurrentStyleDef()->m_szName; @@ -97,7 +97,7 @@ void ScreenStyleSplash::MenuBack( PlayerNumber pn ) return; this->ClearMessageQueue(); m_Menu.Back( SM_GoToPrevScreen ); - SOUNDMAN->PlayOnce( THEME->GetPathToS("menu back") ); + SOUND->PlayOnce( THEME->GetPathToS("menu back") ); } void ScreenStyleSplash::DrawPrimitives() diff --git a/stepmania/src/ScreenTest.cpp b/stepmania/src/ScreenTest.cpp index 308cdad114..34d0b7c011 100644 --- a/stepmania/src/ScreenTest.cpp +++ b/stepmania/src/ScreenTest.cpp @@ -18,6 +18,7 @@ #include "ScreenTestSound.h" #include "ScreenTestFonts.h" #include "ScreenManager.h" +#include "RageSounds.h" ScreenTest::~ScreenTest() @@ -43,7 +44,7 @@ ScreenTest::ScreenTest() : Screen("ScreenTest") current = NULL; cur_screen = -1; - SOUNDMAN->StopMusic(); + SOUND->StopMusic(); SetScreen(0); } diff --git a/stepmania/src/ScreenTextEntry.cpp b/stepmania/src/ScreenTextEntry.cpp index a57b468ae5..3f51ac699a 100644 --- a/stepmania/src/ScreenTextEntry.cpp +++ b/stepmania/src/ScreenTextEntry.cpp @@ -13,7 +13,7 @@ #include "ScreenTextEntry.h" #include "PrefsManager.h" #include "ScreenManager.h" -#include "RageSoundManager.h" +#include "RageSounds.h" #include "ScreenTitleMenu.h" #include "GameConstantsAndTypes.h" #include "PrefsManager.h" @@ -204,7 +204,7 @@ void ScreenTextEntry::MenuStart( PlayerNumber pn ) m_textAnswer.BeginTweening( 0.2f ); m_textAnswer.SetDiffuse( RageColor(1,1,1,0) ); - SOUNDMAN->PlayOnce( THEME->GetPathToS("Common start") ); + SOUND->PlayOnce( THEME->GetPathToS("Common start") ); if( m_bCancelled ) { if( m_pOnCancel ) m_pOnCancel(); diff --git a/stepmania/src/ScreenTitleMenu.cpp b/stepmania/src/ScreenTitleMenu.cpp index ac35c39a81..37cc3ee834 100644 --- a/stepmania/src/ScreenTitleMenu.cpp +++ b/stepmania/src/ScreenTitleMenu.cpp @@ -25,7 +25,7 @@ #include "InputMapper.h" #include "ThemeManager.h" #include "SDL_utils.h" -#include "RageSoundManager.h" +#include "RageSounds.h" #include "CodeDetector.h" #include "RageTextureManager.h" #include "UnlockSystem.h" @@ -136,7 +136,7 @@ ScreenTitleMenu::ScreenTitleMenu() : Screen("ScreenTitleMenu") this->AddChild( &m_BeginOut ); - SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("title menu game name") ); + SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("title menu game name") ); m_soundAttract.Load( ANNOUNCER->GetPathTo("title menu attract") ); @@ -150,7 +150,7 @@ ScreenTitleMenu::ScreenTitleMenu() : Screen("ScreenTitleMenu") LoseFocus( i ); GainFocus( m_Choice ); - SOUNDMAN->PlayMusic( THEME->GetPathToS("ScreenTitleMenu music") ); + SOUND->PlayMusic( THEME->GetPathToS("ScreenTitleMenu music") ); this->PostScreenMessage( SM_PlayComment, SECONDS_BETWEEN_COMMENTS); diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp index 5f429ee9cc..db631d0789 100644 --- a/stepmania/src/StepMania.cpp +++ b/stepmania/src/StepMania.cpp @@ -620,7 +620,7 @@ bool HandleGlobalInputs( DeviceInput DeviceI, InputEventType type, GameInput Gam break; GAMESTATE->m_iCoins++; SCREENMAN->RefreshCreditsMessages(); - SOUNDMAN->PlayOnce( THEME->GetPathToS("Common coin") ); + SOUND->PlayOnce( THEME->GetPathToS("Common coin") ); return false; // Attract need to know because they go to TitleMenu on > 1 credit }