diff --git a/stepmania/src/MenuElements.cpp b/stepmania/src/MenuElements.cpp index 1e8e328ddf..74e241948b 100644 --- a/stepmania/src/MenuElements.cpp +++ b/stepmania/src/MenuElements.cpp @@ -13,7 +13,7 @@ #include "MenuElements.h" #include "RageTextureManager.h" #include "RageUtil.h" -#include "RageMusic.h" +#include "RageSoundManager.h" #include "ScreenManager.h" #include "GameConstantsAndTypes.h" #include "PrefsManager.h" diff --git a/stepmania/src/MusicBannerWheel.cpp b/stepmania/src/MusicBannerWheel.cpp index 6f6741b743..89c78c93dd 100644 --- a/stepmania/src/MusicBannerWheel.cpp +++ b/stepmania/src/MusicBannerWheel.cpp @@ -16,7 +16,7 @@ #include "PrefsManager.h" #include "SongManager.h" #include "ThemeManager.h" -#include "RageMusic.h" +#include "RageSoundManager.h" #include "StyleDef.h" #define BANNERSPACING 200 diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp index 14eca927f2..abc6f22988 100644 --- a/stepmania/src/MusicWheel.cpp +++ b/stepmania/src/MusicWheel.cpp @@ -15,7 +15,7 @@ #include "SongManager.h" #include "GameManager.h" #include "PrefsManager.h" -#include "RageMusic.h" +#include "RageSoundManager.h" #include "ScreenManager.h" // for sending SM_PlayMusicSample #include "RageLog.h" #include "GameConstantsAndTypes.h" diff --git a/stepmania/src/ScreenAppearanceOptions.cpp b/stepmania/src/ScreenAppearanceOptions.cpp index 5829bfb1c7..0841a0307f 100644 --- a/stepmania/src/ScreenAppearanceOptions.cpp +++ b/stepmania/src/ScreenAppearanceOptions.cpp @@ -13,7 +13,7 @@ #include "ScreenAppearanceOptions.h" #include "RageTextureManager.h" #include "RageUtil.h" -#include "RageMusic.h" +#include "RageSoundManager.h" #include "ScreenManager.h" #include "PrefsManager.h" #include "GameConstantsAndTypes.h" diff --git a/stepmania/src/ScreenCaution.cpp b/stepmania/src/ScreenCaution.cpp index 2d18f176af..2a8c451db4 100644 --- a/stepmania/src/ScreenCaution.cpp +++ b/stepmania/src/ScreenCaution.cpp @@ -15,7 +15,7 @@ #include "PrefsManager.h" #include "AnnouncerManager.h" #include "GameState.h" -#include "RageMusic.h" +#include "RageSoundManager.h" #include "ThemeManager.h" diff --git a/stepmania/src/ScreenEdit.h b/stepmania/src/ScreenEdit.h index 7b1bee22d2..8ce2392650 100644 --- a/stepmania/src/ScreenEdit.h +++ b/stepmania/src/ScreenEdit.h @@ -16,7 +16,7 @@ #include "Player.h" #include "RandomSample.h" #include "FocusingSprite.h" -#include "RageMusic.h" +#include "RageSoundManager.h" #include "RageSound.h" #include "MotionBlurSprite.h" #include "BGAnimation.h" diff --git a/stepmania/src/ScreenEditMenu.cpp b/stepmania/src/ScreenEditMenu.cpp index 5af38a0189..8994b75a82 100644 --- a/stepmania/src/ScreenEditMenu.cpp +++ b/stepmania/src/ScreenEditMenu.cpp @@ -19,7 +19,7 @@ #include "GameManager.h" #include "RageLog.h" #include "GameState.h" -#include "RageMusic.h" +#include "RageSoundManager.h" #include "ThemeManager.h" diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index df1cf03fbb..35a5497ca2 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -23,7 +23,7 @@ #include "GameState.h" #include "GrooveRadar.h" #include "ThemeManager.h" -#include "RageMusic.h" +#include "RageSoundManager.h" #define SONGSEL_SCREEN THEME->GetMetric("ScreenEvaluation","SongSelectScreen") diff --git a/stepmania/src/ScreenEz2SelectMusic.cpp b/stepmania/src/ScreenEz2SelectMusic.cpp index 53d3129f80..ff22a74b6e 100644 --- a/stepmania/src/ScreenEz2SelectMusic.cpp +++ b/stepmania/src/ScreenEz2SelectMusic.cpp @@ -22,7 +22,7 @@ #include "SDL_opengl.h" #include "ScreenSandbox.h" #include "ScreenManager.h" -#include "RageMusic.h" +#include "RageSoundManager.h" #include "GameConstantsAndTypes.h" #include "PrefsManager.h" #include "ThemeManager.h" diff --git a/stepmania/src/ScreenEz2SelectPlayer.cpp b/stepmania/src/ScreenEz2SelectPlayer.cpp index 26dc8e8542..6ad1857bc6 100644 --- a/stepmania/src/ScreenEz2SelectPlayer.cpp +++ b/stepmania/src/ScreenEz2SelectPlayer.cpp @@ -11,7 +11,7 @@ Andrew Livy #include "ScreenEz2SelectPlayer.h" #include "ScreenManager.h" #include "PrefsManager.h" -#include "RageMusic.h" +#include "RageSoundManager.h" #include "GameConstantsAndTypes.h" #include "PrefsManager.h" #include "GameManager.h" diff --git a/stepmania/src/ScreenGameOver.cpp b/stepmania/src/ScreenGameOver.cpp index a8e8fa2817..d95cb166a1 100644 --- a/stepmania/src/ScreenGameOver.cpp +++ b/stepmania/src/ScreenGameOver.cpp @@ -19,7 +19,7 @@ #include "ScreenManager.h" #include "AnnouncerManager.h" #include "GameState.h" -#include "RageMusic.h" +#include "RageSoundManager.h" #include "ThemeManager.h" diff --git a/stepmania/src/ScreenGameplay.h b/stepmania/src/ScreenGameplay.h index 992caddfca..36615ca89b 100644 --- a/stepmania/src/ScreenGameplay.h +++ b/stepmania/src/ScreenGameplay.h @@ -11,21 +11,21 @@ #include "Screen.h" #include "Sprite.h" -#include "TransitionStarWipe.h" #include "TransitionFade.h" +#include "TransitionStarWipe.h" +#include "TransitionFadeWipe.h" +#include "TransitionOniFade.h" #include "BitmapText.h" #include "Player.h" #include "RandomSample.h" #include "FocusingSprite.h" -#include "RageMusic.h" +#include "RageSoundManager.h" #include "RageSound.h" #include "MotionBlurSprite.h" #include "Background.h" #include "LifeMeter.h" #include "ScoreDisplay.h" #include "DifficultyIcon.h" -#include "TransitionFadeWipe.h" -#include "TransitionOniFade.h" #include "BPMDisplay.h" // messages sent by Combo diff --git a/stepmania/src/ScreenGraphicOptions.cpp b/stepmania/src/ScreenGraphicOptions.cpp index f1f2b819c3..d20b9ea223 100644 --- a/stepmania/src/ScreenGraphicOptions.cpp +++ b/stepmania/src/ScreenGraphicOptions.cpp @@ -13,14 +13,12 @@ #include "ScreenGraphicOptions.h" #include "RageTextureManager.h" #include "RageUtil.h" -#include "RageMusic.h" +#include "RageSoundManager.h" #include "ScreenManager.h" #include "PrefsManager.h" #include "GameConstantsAndTypes.h" #include "StepMania.h" -#include "PrefsManager.h" #include "RageLog.h" -#include "PrefsManager.h" #include "ThemeManager.h" #include "RageDisplay.h" diff --git a/stepmania/src/ScreenHowToPlay.cpp b/stepmania/src/ScreenHowToPlay.cpp index b63715f89d..c6cbf91259 100644 --- a/stepmania/src/ScreenHowToPlay.cpp +++ b/stepmania/src/ScreenHowToPlay.cpp @@ -13,7 +13,7 @@ #include "ScreenHowToPlay.h" #include "RageTextureManager.h" #include "RageUtil.h" -#include "RageMusic.h" +#include "RageSoundManager.h" #include "ScreenManager.h" #include "GameConstantsAndTypes.h" #include "RageLog.h" diff --git a/stepmania/src/ScreenInputOptions.cpp b/stepmania/src/ScreenInputOptions.cpp index a4db42a375..59ea5ff032 100644 --- a/stepmania/src/ScreenInputOptions.cpp +++ b/stepmania/src/ScreenInputOptions.cpp @@ -13,7 +13,7 @@ #include "ScreenInputOptions.h" #include "RageTextureManager.h" #include "RageUtil.h" -#include "RageMusic.h" +#include "RageSoundManager.h" #include "ScreenManager.h" #include "PrefsManager.h" #include "GameConstantsAndTypes.h" diff --git a/stepmania/src/ScreenMachineOptions.cpp b/stepmania/src/ScreenMachineOptions.cpp index cc63b90d14..bbebca1151 100644 --- a/stepmania/src/ScreenMachineOptions.cpp +++ b/stepmania/src/ScreenMachineOptions.cpp @@ -13,7 +13,7 @@ #include "ScreenMachineOptions.h" #include "RageTextureManager.h" #include "RageUtil.h" -#include "RageMusic.h" +#include "RageSoundManager.h" #include "ScreenManager.h" #include "PrefsManager.h" #include "GameConstantsAndTypes.h" diff --git a/stepmania/src/ScreenMapControllers.cpp b/stepmania/src/ScreenMapControllers.cpp index 39b00d6910..882a679b6d 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 "RageMusic.h" +#include "RageSoundManager.h" #include "ThemeManager.h" diff --git a/stepmania/src/ScreenMusicScroll.h b/stepmania/src/ScreenMusicScroll.h index 3a84e0f17a..eb047e4226 100644 --- a/stepmania/src/ScreenMusicScroll.h +++ b/stepmania/src/ScreenMusicScroll.h @@ -12,7 +12,7 @@ #include "Screen.h" #include "Sprite.h" #include "TransitionFade.h" -#include "RageSoundStream.h" +#include "RageSoundManager.h" #include "MenuElements.h" diff --git a/stepmania/src/ScreenNetworkWaiting.cpp b/stepmania/src/ScreenNetworkWaiting.cpp index ff23bc99a7..7b2293a5ac 100644 --- a/stepmania/src/ScreenNetworkWaiting.cpp +++ b/stepmania/src/ScreenNetworkWaiting.cpp @@ -19,7 +19,7 @@ #include "GameManager.h" #include "RageLog.h" #include "GameState.h" -#include "RageMusic.h" +#include "RageSoundManager.h" #include "ThemeManager.h" #include "RageNetworkClient.h" #include "NetGameState.h" diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp index 2d4114584a..9f57c07ee1 100644 --- a/stepmania/src/ScreenOptions.cpp +++ b/stepmania/src/ScreenOptions.cpp @@ -13,7 +13,7 @@ #include "ScreenOptions.h" #include "RageTextureManager.h" #include "RageUtil.h" -#include "RageMusic.h" +#include "RageSoundManager.h" #include "ScreenManager.h" #include "PrefsManager.h" #include "GameConstantsAndTypes.h" diff --git a/stepmania/src/ScreenPrompt.cpp b/stepmania/src/ScreenPrompt.cpp index 8aa5de10ed..b2e6f1fca5 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 "RageMusic.h" +#include "RageSoundManager.h" #include "GameConstantsAndTypes.h" #include "PrefsManager.h" #include "ThemeManager.h" diff --git a/stepmania/src/ScreenSandbox.cpp b/stepmania/src/ScreenSandbox.cpp index 67dd0db318..6238802b07 100644 --- a/stepmania/src/ScreenSandbox.cpp +++ b/stepmania/src/ScreenSandbox.cpp @@ -23,7 +23,7 @@ #include "SDL_opengl.h" #include "ScreenSandbox.h" #include "ScreenManager.h" -#include "RageMusic.h" +#include "RageSoundManager.h" #include "GameConstantsAndTypes.h" #include "PrefsManager.h" #include "Quad.h" diff --git a/stepmania/src/ScreenSelectCourse.cpp b/stepmania/src/ScreenSelectCourse.cpp index f01b6e6004..170f1682bb 100644 --- a/stepmania/src/ScreenSelectCourse.cpp +++ b/stepmania/src/ScreenSelectCourse.cpp @@ -16,14 +16,13 @@ #include "PrefsManager.h" #include "SongManager.h" #include "GameManager.h" -#include "RageMusic.h" #include "GameConstantsAndTypes.h" #include "RageLog.h" #include "InputMapper.h" #include "InputQueue.h" #include "AnnouncerManager.h" #include "GameState.h" -#include "RageMusic.h" +#include "RageSoundManager.h" #include "CodeDetector.h" #include "ThemeManager.h" diff --git a/stepmania/src/ScreenSelectDifficulty.cpp b/stepmania/src/ScreenSelectDifficulty.cpp index 31ace34345..55ad2fe16a 100644 --- a/stepmania/src/ScreenSelectDifficulty.cpp +++ b/stepmania/src/ScreenSelectDifficulty.cpp @@ -18,7 +18,7 @@ #include "GameConstantsAndTypes.h" #include "AnnouncerManager.h" #include "GameState.h" -#include "RageMusic.h" +#include "RageSoundManager.h" #include "ThemeManager.h" diff --git a/stepmania/src/ScreenSelectGame.cpp b/stepmania/src/ScreenSelectGame.cpp index 3d44190007..6bc6e357e5 100644 --- a/stepmania/src/ScreenSelectGame.cpp +++ b/stepmania/src/ScreenSelectGame.cpp @@ -10,7 +10,7 @@ */ #include "ScreenSelectGame.h" -#include "RageMusic.h" +#include "RageSoundManager.h" #include "ScreenManager.h" #include "PrefsManager.h" #include "RageLog.h" diff --git a/stepmania/src/ScreenSelectGroup.cpp b/stepmania/src/ScreenSelectGroup.cpp index a45beb9ca8..05c3e9d6c4 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 "RageMusic.h" +#include "RageSoundManager.h" #include "ThemeManager.h" #include diff --git a/stepmania/src/ScreenSelectMode.cpp b/stepmania/src/ScreenSelectMode.cpp index 5a2b8f6529..362ee6333f 100644 --- a/stepmania/src/ScreenSelectMode.cpp +++ b/stepmania/src/ScreenSelectMode.cpp @@ -12,7 +12,7 @@ Chris Danford #include "ScreenSelectMode.h" #include "ScreenManager.h" #include "PrefsManager.h" -#include "RageMusic.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 f3d89edad2..e56237845b 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 "RageMusic.h" +#include "RageSoundManager.h" #include "GameConstantsAndTypes.h" #include "PrefsManager.h" #include "RageLog.h" diff --git a/stepmania/src/ScreenSelectStyle.cpp b/stepmania/src/ScreenSelectStyle.cpp index 4f0f3514a0..36115c7226 100644 --- a/stepmania/src/ScreenSelectStyle.cpp +++ b/stepmania/src/ScreenSelectStyle.cpp @@ -14,7 +14,7 @@ #include "ScreenSelectStyle.h" #include "ScreenManager.h" #include "PrefsManager.h" -#include "RageMusic.h" +#include "RageSoundManager.h" #include "GameConstantsAndTypes.h" #include "PrefsManager.h" #include "GameManager.h" diff --git a/stepmania/src/ScreenSelectStyle5th.cpp b/stepmania/src/ScreenSelectStyle5th.cpp index cdfaf11078..05d42ef9ec 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 "RageMusic.h" +#include "RageSoundManager.h" #include "GameConstantsAndTypes.h" #include "PrefsManager.h" #include "GameManager.h" diff --git a/stepmania/src/ScreenSongOptions.cpp b/stepmania/src/ScreenSongOptions.cpp index f499b9ff61..21b66c9a96 100644 --- a/stepmania/src/ScreenSongOptions.cpp +++ b/stepmania/src/ScreenSongOptions.cpp @@ -12,7 +12,7 @@ #include "ScreenSongOptions.h" #include "RageUtil.h" -#include "RageMusic.h" +#include "RageSoundManager.h" #include "ScreenManager.h" #include "GameConstantsAndTypes.h" #include "RageLog.h" diff --git a/stepmania/src/ScreenStage.cpp b/stepmania/src/ScreenStage.cpp index 5a119556d6..3b981f99b4 100644 --- a/stepmania/src/ScreenStage.cpp +++ b/stepmania/src/ScreenStage.cpp @@ -22,7 +22,7 @@ #include "Sprite.h" #include "AnnouncerManager.h" #include "GameState.h" -#include "RageMusic.h" +#include "RageSoundManager.h" #include "ThemeManager.h" #include "RageDisplay.h" diff --git a/stepmania/src/ScreenTextEntry.cpp b/stepmania/src/ScreenTextEntry.cpp index 57d57212a4..13167e9495 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 "RageMusic.h" +#include "RageSoundManager.h" #include "ScreenTitleMenu.h" #include "GameConstantsAndTypes.h" #include "PrefsManager.h" diff --git a/stepmania/src/ScreenTitleMenu.cpp b/stepmania/src/ScreenTitleMenu.cpp index ed5e53c04f..12375e17ad 100644 --- a/stepmania/src/ScreenTitleMenu.cpp +++ b/stepmania/src/ScreenTitleMenu.cpp @@ -24,7 +24,8 @@ #include "InputMapper.h" #include "ThemeManager.h" #include "SDL_Utils.h" -#include "RageMusic.h" +#include "RageSoundManager.h" + const CString CHOICE_TEXT[ScreenTitleMenu::NUM_TITLE_MENU_CHOICES] = { "GAME START", diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp index bf4389f46d..50d4b759a3 100644 --- a/stepmania/src/StepMania.cpp +++ b/stepmania/src/StepMania.cpp @@ -18,7 +18,6 @@ #include "RageTextureManager.h" #include "RageSoundBass.h" #include "RageSoundManager.h" -#include "RageMusic.h" #include "RageInput.h" #include "RageTimer.h" #include "RageException.h" @@ -200,7 +199,6 @@ int main(int argc, char* argv[]) THEME = new ThemeManager; SOUND = new RageSoundBass; SOUNDMAN = new RageSoundManager(PREFSMAN->m_bSoundDrivers); - MUSIC = new RageSoundStream; ANNOUNCER = new AnnouncerManager; INPUTFILTER = new InputFilter; INPUTMAPPER = new InputMapper; @@ -295,7 +293,6 @@ int main(int argc, char* argv[]) SAFE_DELETE( THEME ); SAFE_DELETE( ANNOUNCER ); SAFE_DELETE( INPUTMAN ); - SAFE_DELETE( MUSIC ); SAFE_DELETE( SOUND ); SAFE_DELETE( SOUNDMAN ); SAFE_DELETE( FONT ); @@ -431,7 +428,6 @@ static void GameLoop() fDeltaTime /= 4; TEXTUREMAN->Update( fDeltaTime ); - MUSIC->Update( fDeltaTime ); SCREENMAN->Update( fDeltaTime ); CLIENT->Update( fDeltaTime ); SOUNDMAN->Update( fDeltaTime ); diff --git a/stepmania/src/StepMania.dsp b/stepmania/src/StepMania.dsp index 6682feda1c..ad51e1ea24 100644 --- a/stepmania/src/StepMania.dsp +++ b/stepmania/src/StepMania.dsp @@ -214,14 +214,6 @@ SOURCE=.\RageMovieTexture.h # End Source File # Begin Source File -SOURCE=.\RageMusic.cpp -# End Source File -# Begin Source File - -SOURCE=.\RageMusic.h -# End Source File -# Begin Source File - SOURCE=.\RageNetworkClient.cpp # End Source File # Begin Source File diff --git a/stepmania/src/StepMania.vcproj b/stepmania/src/StepMania.vcproj index 36b0d8d004..6af82a4b90 100644 --- a/stepmania/src/StepMania.vcproj +++ b/stepmania/src/StepMania.vcproj @@ -1137,12 +1137,6 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ - - - - diff --git a/stepmania/src/TransitionKeepAlive.cpp b/stepmania/src/TransitionKeepAlive.cpp index e9385034dc..f35b881150 100644 --- a/stepmania/src/TransitionKeepAlive.cpp +++ b/stepmania/src/TransitionKeepAlive.cpp @@ -15,7 +15,7 @@ #include "RageUtil.h" #include "GameConstantsAndTypes.h" #include "PrefsManager.h" -#include "RageMusic.h" +#include "RageSoundManager.h" #include "ThemeManager.h" #include "RageLog.h" @@ -95,7 +95,7 @@ void TransitionKeepAlive::OpenWipingRight( ScreenMessage send_when_done ) void TransitionKeepAlive::OpenWipingLeft( ScreenMessage send_when_done ) { if( STOP_MUSIC_ON_NEXT ) - MUSIC->Stop(); + SOUNDMAN->music->StopPlaying(); this->SetTransitionTime( KEEP_ALIVE_BACKWARD_TRANSITION_TIME );