RageSounds -> GameSoundManager

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"

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")

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"

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")

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")

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"

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"
 
 

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"
 

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"

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"
 
 

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"

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"
 

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"

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"

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"

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"

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"

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"

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"
 
 

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"

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")

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"

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"

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"
 

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"

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"
 

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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 <map>
 #include "ActorUtil.h"

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"

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"

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"

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"

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"

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"

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()

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"
 

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"

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"

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"

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"