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

MusicBannerWheel Comparison Fixes

Browse Source
This commit is contained in:
Andrew Livy
2003-09-15 22:21:18 +00:00
parent e164953d02
commit f598a50e6f
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/MusicBannerWheel.cpp
+8 -3
View File
@@ -334,9 +334,14 @@ void MusicBannerWheel::PlayMusicSample()
Song* pSong = GetSelectedSong(); Song* pSong = GetSelectedSong();
if( pSong && pSong->HasMusic() ) if( pSong && pSong->HasMusic() )
{ {
SOUND->PlayMusic(pSong->GetMusicPath(), true, if(SOUND->GetMusicPath().CompareNoCase(pSong->GetMusicPath())) // dont play the same sound over and over
pSong->m_fMusicSampleStartSeconds, {
pSong->m_fMusicSampleLengthSeconds);
SOUND->StopMusic();
SOUND->PlayMusic(pSong->GetMusicPath(), true,
pSong->m_fMusicSampleStartSeconds,
pSong->m_fMusicSampleLengthSeconds);
}
} }
} }
stepmania/src/RageSounds.cpp
+2
View File
@@ -26,6 +26,8 @@ CString RageSounds::GetMusicPath() const
void RageSounds::PlayMusic(CString file, bool force_loop, float start_sec, float length_sec, float fade_len) void RageSounds::PlayMusic(CString file, bool force_loop, float start_sec, float length_sec, float fade_len)
{ {
// LOG->Trace("play '%s' (current '%s')", file.c_str(), music->GetLoadedFilePath().c_str()); // LOG->Trace("play '%s' (current '%s')", file.c_str(), music->GetLoadedFilePath().c_str());
CString loaded = music->GetLoadedFilePath();
if(music->IsPlaying()) if(music->IsPlaying())
{ {
if( !music->GetLoadedFilePath().CompareNoCase(file) ) if( !music->GetLoadedFilePath().CompareNoCase(file) )