actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

PlayMusic("") -> StopMusic()

Browse Source
This commit is contained in:
Chris Danford
2005-07-22 23:07:49 +00:00
parent 85cc76f064
commit d0f871e9ff
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenAttract.cpp
+2 -2
View File
@@ -101,7 +101,7 @@ void ScreenAttract::StartPlayingMusic()
{ {
if( !GAMESTATE->IsTimeToPlayAttractSounds() ) if( !GAMESTATE->IsTimeToPlayAttractSounds() )
{ {
SOUND->PlayMusic( "" ); // stop music SOUND->StopMusic();
return; return;
} }
@@ -130,7 +130,7 @@ void ScreenAttract::HandleScreenMessage( const ScreenMessage SM )
bMusicChanging = THEME->GetPathS(m_sName,"music") != THEME->GetPathS(GetNextScreen(),"music",true); // GetPath optional on the next screen because it may not have music. bMusicChanging = THEME->GetPathS(m_sName,"music") != THEME->GetPathS(GetNextScreen(),"music",true); // GetPath optional on the next screen because it may not have music.
if( bMusicChanging ) if( bMusicChanging )
SOUND->PlayMusic( "" ); // stop the music SOUND->StopMusic();
} }
ScreenWithMenuElements::HandleScreenMessage( SM ); ScreenWithMenuElements::HandleScreenMessage( SM );
stepmania/src/ScreenEdit.cpp
+1 -2
View File
@@ -750,7 +750,6 @@ void ScreenEdit::PlayTicks()
void ScreenEdit::PlayPreviewMusic() void ScreenEdit::PlayPreviewMusic()
{ {
SOUND->PlayMusic("");
SOUND->PlayMusic( SOUND->PlayMusic(
m_pSong->GetMusicPath(), m_pSong->GetMusicPath(),
NULL, NULL,
@@ -1851,7 +1850,7 @@ void ScreenEdit::TransitionEditState( EditState em )
} }
/* If we're playing music, sample music or assist ticks when changing modes, stop. */ /* If we're playing music, sample music or assist ticks when changing modes, stop. */
SOUND->PlayMusic(""); SOUND->StopMusic();
m_soundMusic.StopPlaying(); m_soundMusic.StopPlaying();
m_soundAssistTick.StopPlaying(); m_soundAssistTick.StopPlaying();
GAMESTATE->m_bPastHereWeGo = false; GAMESTATE->m_bPastHereWeGo = false;