diff --git a/stepmania/src/RageSounds.cpp b/stepmania/src/GameSoundManager.cpp similarity index 99% rename from stepmania/src/RageSounds.cpp rename to stepmania/src/GameSoundManager.cpp index 12799d2566..d75c99043b 100644 --- a/stepmania/src/RageSounds.cpp +++ b/stepmania/src/GameSoundManager.cpp @@ -1,6 +1,6 @@ #include "global.h" #include "RageSoundManager.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "RageSound.h" #include "RageLog.h" #include "RageUtil.h" diff --git a/stepmania/src/RageSounds.h b/stepmania/src/GameSoundManager.h similarity index 100% rename from stepmania/src/RageSounds.h rename to stepmania/src/GameSoundManager.h diff --git a/stepmania/src/MenuTimer.cpp b/stepmania/src/MenuTimer.cpp index b251f2e671..9bb7ba7c0b 100644 --- a/stepmania/src/MenuTimer.cpp +++ b/stepmania/src/MenuTimer.cpp @@ -7,7 +7,7 @@ #include "AnnouncerManager.h" #include "ThemeManager.h" #include "Font.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #define WARNING_START THEME->GetMetricI("MenuTimer","WarningStart") #define WARNING_BEEP_START THEME->GetMetricI("MenuTimer","WarningBeepStart") diff --git a/stepmania/src/MusicBannerWheel.cpp b/stepmania/src/MusicBannerWheel.cpp index 48e2eb761e..fa42944931 100644 --- a/stepmania/src/MusicBannerWheel.cpp +++ b/stepmania/src/MusicBannerWheel.cpp @@ -15,7 +15,7 @@ TODO: #include "PrefsManager.h" #include "SongManager.h" #include "ThemeManager.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "Style.h" #include "song.h" #include "ActorUtil.h" diff --git a/stepmania/src/Screen.cpp b/stepmania/src/Screen.cpp index 39dabaeeb8..bd851c32d3 100644 --- a/stepmania/src/Screen.cpp +++ b/stepmania/src/Screen.cpp @@ -6,7 +6,7 @@ #include "RageSound.h" #include "ThemeManager.h" #include "ScreenManager.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "ProfileManager.h" #define NEXT_SCREEN THEME->GetMetric (m_sName,"NextScreen") diff --git a/stepmania/src/ScreenAttract.cpp b/stepmania/src/ScreenAttract.cpp index e506460b69..71a88b64a6 100644 --- a/stepmania/src/ScreenAttract.cpp +++ b/stepmania/src/ScreenAttract.cpp @@ -13,7 +13,7 @@ #include "GameManager.h" #include "InputMapper.h" #include "ThemeManager.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #define NEXT_SCREEN THEME->GetMetric (m_sName,"NextScreen") #define INITIAL_SCREEN THEME->GetMetric ("Common","InitialScreen") diff --git a/stepmania/src/ScreenBookkeeping.cpp b/stepmania/src/ScreenBookkeeping.cpp index f3bdf93bbf..00bf512510 100644 --- a/stepmania/src/ScreenBookkeeping.cpp +++ b/stepmania/src/ScreenBookkeeping.cpp @@ -8,7 +8,7 @@ #include "InputMapper.h" #include "GameManager.h" #include "GameState.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "ThemeManager.h" #include "RageDisplay.h" #include "Bookkeeper.h" diff --git a/stepmania/src/ScreenCaution.cpp b/stepmania/src/ScreenCaution.cpp index 9968b07164..3ac9f89fa9 100644 --- a/stepmania/src/ScreenCaution.cpp +++ b/stepmania/src/ScreenCaution.cpp @@ -4,7 +4,7 @@ #include "PrefsManager.h" #include "ScreenManager.h" #include "AnnouncerManager.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "ThemeManager.h" diff --git a/stepmania/src/ScreenCenterImage.cpp b/stepmania/src/ScreenCenterImage.cpp index 629330262e..2c571fc0f8 100644 --- a/stepmania/src/ScreenCenterImage.cpp +++ b/stepmania/src/ScreenCenterImage.cpp @@ -7,7 +7,7 @@ #include "RageLog.h" #include "InputMapper.h" #include "GameManager.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "ThemeManager.h" #include "RageDisplay.h" diff --git a/stepmania/src/ScreenCredits.cpp b/stepmania/src/ScreenCredits.cpp index 15a8a21902..334965c5a4 100644 --- a/stepmania/src/ScreenCredits.cpp +++ b/stepmania/src/ScreenCredits.cpp @@ -1,6 +1,6 @@ #include "global.h" #include "ScreenCredits.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "RageLog.h" #include "SongManager.h" #include "ThemeManager.h" diff --git a/stepmania/src/ScreenDemonstration.cpp b/stepmania/src/ScreenDemonstration.cpp index f059ad849f..da6e20f264 100644 --- a/stepmania/src/ScreenDemonstration.cpp +++ b/stepmania/src/ScreenDemonstration.cpp @@ -8,7 +8,7 @@ #include "ScreenAttract.h" // for AttractInput() #include "ScreenManager.h" #include "RageSoundManager.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "GameManager.h" diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp index d82ae90d5b..45c9dd7c6a 100644 --- a/stepmania/src/ScreenEdit.cpp +++ b/stepmania/src/ScreenEdit.cpp @@ -8,7 +8,7 @@ #include "GameManager.h" #include "GameConstantsAndTypes.h" #include "RageLog.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "GameState.h" #include "InputMapper.h" #include "RageLog.h" diff --git a/stepmania/src/ScreenEditCoursesMenu.cpp b/stepmania/src/ScreenEditCoursesMenu.cpp index ea816b172e..702f0a2832 100644 --- a/stepmania/src/ScreenEditCoursesMenu.cpp +++ b/stepmania/src/ScreenEditCoursesMenu.cpp @@ -7,7 +7,7 @@ #include "GameManager.h" #include "RageLog.h" #include "GameState.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "ThemeManager.h" #include "Steps.h" diff --git a/stepmania/src/ScreenEditMenu.cpp b/stepmania/src/ScreenEditMenu.cpp index 4e70beabf8..5b890197ae 100644 --- a/stepmania/src/ScreenEditMenu.cpp +++ b/stepmania/src/ScreenEditMenu.cpp @@ -8,7 +8,7 @@ #include "GameManager.h" #include "RageLog.h" #include "GameState.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "ThemeManager.h" #include "Steps.h" #include "song.h" diff --git a/stepmania/src/ScreenEnding.cpp b/stepmania/src/ScreenEnding.cpp index a9cefa2791..aa225d74be 100644 --- a/stepmania/src/ScreenEnding.cpp +++ b/stepmania/src/ScreenEnding.cpp @@ -1,7 +1,7 @@ #include "global.h" #include "ScreenEnding.h" #include "SongManager.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "ThemeManager.h" #include "AnnouncerManager.h" #include "song.h" diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index 95c5b1393d..f9f2e53292 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -12,7 +12,7 @@ #include "GameState.h" #include "GrooveRadar.h" #include "ThemeManager.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "ActorUtil.h" #include "RageTimer.h" #include "UnlockSystem.h" diff --git a/stepmania/src/ScreenExit.cpp b/stepmania/src/ScreenExit.cpp index bb3234e225..26ec40c035 100644 --- a/stepmania/src/ScreenExit.cpp +++ b/stepmania/src/ScreenExit.cpp @@ -2,7 +2,7 @@ #include "ScreenExit.h" #include "RageUtil.h" #include "RageSoundManager.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "RageSound.h" #include "RageLog.h" #include "StepMania.h" diff --git a/stepmania/src/ScreenEz2SelectMusic.cpp b/stepmania/src/ScreenEz2SelectMusic.cpp index 27ebf5c69f..cb1a88b0dd 100644 --- a/stepmania/src/ScreenEz2SelectMusic.cpp +++ b/stepmania/src/ScreenEz2SelectMusic.cpp @@ -1,7 +1,7 @@ #include "global.h" #include "ScreenEz2SelectMusic.h" #include "ScreenManager.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "GameConstantsAndTypes.h" #include "PrefsManager.h" #include "ThemeManager.h" diff --git a/stepmania/src/ScreenEz2SelectPlayer.cpp b/stepmania/src/ScreenEz2SelectPlayer.cpp index a5feeb0734..86e23797fc 100644 --- a/stepmania/src/ScreenEz2SelectPlayer.cpp +++ b/stepmania/src/ScreenEz2SelectPlayer.cpp @@ -2,7 +2,7 @@ #include "ScreenEz2SelectPlayer.h" #include "ScreenManager.h" #include "PrefsManager.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "GameConstantsAndTypes.h" #include "PrefsManager.h" #include "GameManager.h" diff --git a/stepmania/src/ScreenGameOver.cpp b/stepmania/src/ScreenGameOver.cpp index ab4264e324..f4a296cafd 100644 --- a/stepmania/src/ScreenGameOver.cpp +++ b/stepmania/src/ScreenGameOver.cpp @@ -2,7 +2,7 @@ #include "ScreenGameOver.h" #include "ScreenManager.h" #include "AnnouncerManager.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "ThemeManager.h" diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 0934e5f4c9..7984c19e55 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -27,7 +27,7 @@ #include "ActorUtil.h" #include "NoteSkinManager.h" #include "RageTextureManager.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "CombinedLifeMeterTug.h" #include "Inventory.h" #include "Course.h" diff --git a/stepmania/src/ScreenHowToPlay.cpp b/stepmania/src/ScreenHowToPlay.cpp index abceb3d524..9f65ec3465 100644 --- a/stepmania/src/ScreenHowToPlay.cpp +++ b/stepmania/src/ScreenHowToPlay.cpp @@ -10,7 +10,7 @@ #include "NoteFieldPositioning.h" #include "GameManager.h" #include "NotesLoaderSM.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #define SECONDS_TO_SHOW THEME->GetMetricF("ScreenHowToPlay","SecondsToShow") #define STEPFILE THEME->GetMetric ("ScreenHowToPlay","Stepfile") diff --git a/stepmania/src/ScreenInstructions.cpp b/stepmania/src/ScreenInstructions.cpp index 233c1ab499..29e58506c1 100644 --- a/stepmania/src/ScreenInstructions.cpp +++ b/stepmania/src/ScreenInstructions.cpp @@ -1,7 +1,7 @@ #include "global.h" #include "ScreenInstructions.h" #include "RageUtil.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "ScreenManager.h" #include "GameConstantsAndTypes.h" #include "RageLog.h" diff --git a/stepmania/src/ScreenJukebox.cpp b/stepmania/src/ScreenJukebox.cpp index 75f070b02c..35f10ac887 100644 --- a/stepmania/src/ScreenJukebox.cpp +++ b/stepmania/src/ScreenJukebox.cpp @@ -7,7 +7,7 @@ #include "SongManager.h" #include "StepMania.h" #include "ScreenManager.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "Steps.h" #include "ScreenAttract.h" #include "RageUtil.h" diff --git a/stepmania/src/ScreenJukeboxMenu.cpp b/stepmania/src/ScreenJukeboxMenu.cpp index 46359eb69d..81812b51d5 100644 --- a/stepmania/src/ScreenJukeboxMenu.cpp +++ b/stepmania/src/ScreenJukeboxMenu.cpp @@ -7,7 +7,7 @@ #include "GameManager.h" #include "RageLog.h" #include "GameState.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "ThemeManager.h" #include "ScreenJukebox.h" diff --git a/stepmania/src/ScreenManager.cpp b/stepmania/src/ScreenManager.cpp index 17994b4da8..9d0d11c9ba 100644 --- a/stepmania/src/ScreenManager.cpp +++ b/stepmania/src/ScreenManager.cpp @@ -27,7 +27,7 @@ #include "GameState.h" #include "RageException.h" #include "RageTimer.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "ThemeManager.h" #include "RageDisplay.h" #include "Screen.h" diff --git a/stepmania/src/ScreenMapControllers.cpp b/stepmania/src/ScreenMapControllers.cpp index c4bb6adc39..59eb2e0f70 100644 --- a/stepmania/src/ScreenMapControllers.cpp +++ b/stepmania/src/ScreenMapControllers.cpp @@ -8,7 +8,7 @@ #include "InputMapper.h" #include "GameManager.h" #include "GameState.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "ThemeManager.h" #include "RageDisplay.h" diff --git a/stepmania/src/ScreenMiniMenu.cpp b/stepmania/src/ScreenMiniMenu.cpp index 5cc547d2c6..c7a0a8833f 100644 --- a/stepmania/src/ScreenMiniMenu.cpp +++ b/stepmania/src/ScreenMiniMenu.cpp @@ -2,7 +2,7 @@ #include "ScreenMiniMenu.h" #include "PrefsManager.h" #include "ScreenManager.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "GameConstantsAndTypes.h" #include "PrefsManager.h" #include "ThemeManager.h" diff --git a/stepmania/src/ScreenMusicScroll.cpp b/stepmania/src/ScreenMusicScroll.cpp index 6e59ffdcd4..5cc97e789c 100644 --- a/stepmania/src/ScreenMusicScroll.cpp +++ b/stepmania/src/ScreenMusicScroll.cpp @@ -1,7 +1,7 @@ #include "global.h" #include "ScreenMusicScroll.h" #include "SongManager.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "ThemeManager.h" #include "AnnouncerManager.h" #include "song.h" diff --git a/stepmania/src/ScreenNameEntry.cpp b/stepmania/src/ScreenNameEntry.cpp index c8059a344f..fecadf1740 100644 --- a/stepmania/src/ScreenNameEntry.cpp +++ b/stepmania/src/ScreenNameEntry.cpp @@ -8,7 +8,7 @@ #include "GameManager.h" #include "RageLog.h" #include "GameState.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "ThemeManager.h" #include "ScreenRanking.h" #include "Course.h" diff --git a/stepmania/src/ScreenNameEntryTraditional.cpp b/stepmania/src/ScreenNameEntryTraditional.cpp index 0e4ffe44e7..b0af13d4d5 100644 --- a/stepmania/src/ScreenNameEntryTraditional.cpp +++ b/stepmania/src/ScreenNameEntryTraditional.cpp @@ -8,7 +8,7 @@ #include "GameManager.h" #include "RageLog.h" #include "GameState.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "ThemeManager.h" #include "ScreenRanking.h" #include "Course.h" diff --git a/stepmania/src/ScreenNetworkOptions.cpp b/stepmania/src/ScreenNetworkOptions.cpp index 6327b5b502..d9935f9864 100644 --- a/stepmania/src/ScreenNetworkOptions.cpp +++ b/stepmania/src/ScreenNetworkOptions.cpp @@ -2,7 +2,7 @@ #include "NetworkSyncManager.h" #include "ScreenNetworkOptions.h" #include "RageLog.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "ThemeManager.h" #include "PrefsManager.h" #include "ScreenManager.h" diff --git a/stepmania/src/ScreenOptionsMaster.cpp b/stepmania/src/ScreenOptionsMaster.cpp index 8d6584f052..ebc0c53f5b 100644 --- a/stepmania/src/ScreenOptionsMaster.cpp +++ b/stepmania/src/ScreenOptionsMaster.cpp @@ -16,7 +16,7 @@ #include "Character.h" #include "PrefsManager.h" #include "ScreenOptionsMasterPrefs.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "StepMania.h" #include "RageSoundManager.h" #include "ProfileManager.h" diff --git a/stepmania/src/ScreenPlayerOptions.cpp b/stepmania/src/ScreenPlayerOptions.cpp index 212e22b42f..00fe7172f6 100644 --- a/stepmania/src/ScreenPlayerOptions.cpp +++ b/stepmania/src/ScreenPlayerOptions.cpp @@ -5,7 +5,7 @@ #include "GameState.h" #include "ThemeManager.h" #include "AnnouncerManager.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "ScreenSongOptions.h" #include "PrefsManager.h" #include "CodeDetector.h" diff --git a/stepmania/src/ScreenProfileOptions.cpp b/stepmania/src/ScreenProfileOptions.cpp index 4cc6d3f51a..1efdef2396 100644 --- a/stepmania/src/ScreenProfileOptions.cpp +++ b/stepmania/src/ScreenProfileOptions.cpp @@ -2,7 +2,7 @@ #include "ScreenProfileOptions.h" #include "RageLog.h" #include "ProfileManager.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "ThemeManager.h" #include "PrefsManager.h" #include "ScreenManager.h" diff --git a/stepmania/src/ScreenPrompt.cpp b/stepmania/src/ScreenPrompt.cpp index 2c6edf4d6d..26ff700876 100644 --- a/stepmania/src/ScreenPrompt.cpp +++ b/stepmania/src/ScreenPrompt.cpp @@ -2,7 +2,7 @@ #include "ScreenPrompt.h" #include "PrefsManager.h" #include "ScreenManager.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "GameConstantsAndTypes.h" #include "PrefsManager.h" #include "ThemeManager.h" diff --git a/stepmania/src/ScreenSelect.cpp b/stepmania/src/ScreenSelect.cpp index 7e36fc3553..c465f86b10 100644 --- a/stepmania/src/ScreenSelect.cpp +++ b/stepmania/src/ScreenSelect.cpp @@ -2,7 +2,7 @@ #include "ScreenSelect.h" #include "ScreenManager.h" #include "PrefsManager.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "GameConstantsAndTypes.h" #include "PrefsManager.h" #include "SongManager.h" diff --git a/stepmania/src/ScreenSelectCharacter.cpp b/stepmania/src/ScreenSelectCharacter.cpp index a21a59d91d..d4295f2fb1 100644 --- a/stepmania/src/ScreenSelectCharacter.cpp +++ b/stepmania/src/ScreenSelectCharacter.cpp @@ -1,7 +1,7 @@ #include "global.h" #include "ScreenSelectCharacter.h" #include "ScreenManager.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "RageUtil.h" #include "RageLog.h" #include "ThemeManager.h" diff --git a/stepmania/src/ScreenSelectDifficulty.cpp b/stepmania/src/ScreenSelectDifficulty.cpp index aca4b535ea..3503aa3d85 100644 --- a/stepmania/src/ScreenSelectDifficulty.cpp +++ b/stepmania/src/ScreenSelectDifficulty.cpp @@ -2,7 +2,7 @@ #include "ScreenSelectDifficulty.h" #include "ScreenManager.h" #include "PrefsManager.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "GameManager.h" #include "ThemeManager.h" #include "GameState.h" diff --git a/stepmania/src/ScreenSelectDifficultyEX.cpp b/stepmania/src/ScreenSelectDifficultyEX.cpp index ded22d2b4b..d1ce7d7de2 100644 --- a/stepmania/src/ScreenSelectDifficultyEX.cpp +++ b/stepmania/src/ScreenSelectDifficultyEX.cpp @@ -5,7 +5,7 @@ #include "ModeChoice.h" #include "PrefsManager.h" #include "RageLog.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "ScreenManager.h" #include "ScreenSelectDifficultyEX.h" #include "ThemeManager.h" diff --git a/stepmania/src/ScreenSelectGroup.cpp b/stepmania/src/ScreenSelectGroup.cpp index 64bf351ecd..53530c3c9b 100644 --- a/stepmania/src/ScreenSelectGroup.cpp +++ b/stepmania/src/ScreenSelectGroup.cpp @@ -8,7 +8,7 @@ #include "SongManager.h" #include "AnnouncerManager.h" #include "GameState.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "ThemeManager.h" #include #include "ActorUtil.h" diff --git a/stepmania/src/ScreenSelectMaster.cpp b/stepmania/src/ScreenSelectMaster.cpp index e5f9e78f52..fcb3ce895a 100644 --- a/stepmania/src/ScreenSelectMaster.cpp +++ b/stepmania/src/ScreenSelectMaster.cpp @@ -4,7 +4,7 @@ #include "PrefsManager.h" #include "GameManager.h" #include "ThemeManager.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "GameState.h" #include "AnnouncerManager.h" #include "ModeChoice.h" diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index 90220c98df..ae627259ea 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -4,7 +4,7 @@ #include "PrefsManager.h" #include "SongManager.h" #include "GameManager.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "GameConstantsAndTypes.h" #include "PrefsManager.h" #include "RageLog.h" diff --git a/stepmania/src/ScreenSelectStyle.cpp b/stepmania/src/ScreenSelectStyle.cpp index 70cc63e053..fb301a0abc 100644 --- a/stepmania/src/ScreenSelectStyle.cpp +++ b/stepmania/src/ScreenSelectStyle.cpp @@ -1,7 +1,7 @@ #include "global.h" #include "ScreenSelectStyle.h" #include "GameManager.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "ThemeManager.h" #include "PrefsManager.h" #include "ScreenManager.h" diff --git a/stepmania/src/ScreenSetTime.cpp b/stepmania/src/ScreenSetTime.cpp index 74f37c1ce1..51f11b72c4 100644 --- a/stepmania/src/ScreenSetTime.cpp +++ b/stepmania/src/ScreenSetTime.cpp @@ -8,7 +8,7 @@ #include "InputMapper.h" #include "GameManager.h" #include "GameState.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "ThemeManager.h" #include "RageDisplay.h" #include "Bookkeeper.h" diff --git a/stepmania/src/ScreenStage.cpp b/stepmania/src/ScreenStage.cpp index 1d714304d7..140d1b1d03 100644 --- a/stepmania/src/ScreenStage.cpp +++ b/stepmania/src/ScreenStage.cpp @@ -10,7 +10,7 @@ #include "Sprite.h" #include "AnnouncerManager.h" #include "GameState.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "ThemeManager.h" #include "LightsManager.h" #include "song.h" diff --git a/stepmania/src/ScreenStyleSplash.cpp b/stepmania/src/ScreenStyleSplash.cpp index 46e19d97ad..16ce0b781f 100644 --- a/stepmania/src/ScreenStyleSplash.cpp +++ b/stepmania/src/ScreenStyleSplash.cpp @@ -2,7 +2,7 @@ #include "ScreenStyleSplash.h" #include "GameConstantsAndTypes.h" #include "PrefsManager.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "ScreenManager.h" #include "ThemeManager.h" #include "GameState.h" diff --git a/stepmania/src/ScreenTest.cpp b/stepmania/src/ScreenTest.cpp index 2bc08f0752..afea325fa3 100644 --- a/stepmania/src/ScreenTest.cpp +++ b/stepmania/src/ScreenTest.cpp @@ -4,7 +4,7 @@ #include "ScreenTestSound.h" #include "ScreenTestFonts.h" #include "ScreenManager.h" -#include "RageSounds.h" +#include "GameSoundManager.h" ScreenTest::~ScreenTest() diff --git a/stepmania/src/ScreenTestInput.cpp b/stepmania/src/ScreenTestInput.cpp index 8307761ab8..f42ca7ae1f 100644 --- a/stepmania/src/ScreenTestInput.cpp +++ b/stepmania/src/ScreenTestInput.cpp @@ -8,7 +8,7 @@ #include "InputMapper.h" #include "GameManager.h" #include "GameState.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "ThemeManager.h" #include "RageDisplay.h" diff --git a/stepmania/src/ScreenTestLights.cpp b/stepmania/src/ScreenTestLights.cpp index 46d403f869..bfafb520fa 100644 --- a/stepmania/src/ScreenTestLights.cpp +++ b/stepmania/src/ScreenTestLights.cpp @@ -8,7 +8,7 @@ #include "InputMapper.h" #include "GameManager.h" #include "GameState.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "ThemeManager.h" #include "RageDisplay.h" #include "LightsManager.h" diff --git a/stepmania/src/ScreenTextEntry.cpp b/stepmania/src/ScreenTextEntry.cpp index dd25f48be1..6af1a71e2a 100644 --- a/stepmania/src/ScreenTextEntry.cpp +++ b/stepmania/src/ScreenTextEntry.cpp @@ -2,7 +2,7 @@ #include "ScreenTextEntry.h" #include "PrefsManager.h" #include "ScreenManager.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "ScreenTitleMenu.h" #include "GameConstantsAndTypes.h" #include "PrefsManager.h" diff --git a/stepmania/src/ScreenTitleMenu.cpp b/stepmania/src/ScreenTitleMenu.cpp index d0cb5e447e..0ce02f7734 100644 --- a/stepmania/src/ScreenTitleMenu.cpp +++ b/stepmania/src/ScreenTitleMenu.cpp @@ -13,7 +13,7 @@ #include "GameManager.h" #include "InputMapper.h" #include "ThemeManager.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "CodeDetector.h" #include "RageTextureManager.h" #include "UnlockSystem.h" diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp index 7884030178..25711dcbc6 100644 --- a/stepmania/src/StepMania.cpp +++ b/stepmania/src/StepMania.cpp @@ -8,7 +8,7 @@ #include "RageLog.h" #include "RageTextureManager.h" #include "RageSoundManager.h" -#include "RageSounds.h" +#include "GameSoundManager.h" #include "RageInput.h" #include "RageTimer.h" #include "RageException.h"