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

use PlayMusic

Browse Source
This commit is contained in:
Glenn Maynard
2003-01-02 07:39:25 +00:00
parent b1a1f52bcc
commit 18320299f0
4 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/MusicBannerWheel.cpp
+3 -3
View File
@@ -197,9 +197,9 @@ void MusicBannerWheel::PlayMusicSample()
Song* pSong = GetSelectedSong();
if( pSong && pSong->HasMusic() )
{
MUSIC->Stop();
MUSIC->Load( pSong->GetMusicPath() );
MUSIC->Play( true, pSong->m_fMusicSampleStartSeconds, pSong->m_fMusicSampleLengthSeconds );
SOUNDMAN->PlayMusic(pSong->GetMusicPath(), true,
pSong->m_fMusicSampleStartSeconds,
pSong->m_fMusicSampleLengthSeconds);
}
}
stepmania/src/ScreenAppearanceOptions.cpp
+1 -1
View File
@@ -73,7 +73,7 @@ ScreenAppearanceOptions::ScreenAppearanceOptions() :
m_Menu.SetTimer( 99 );
m_Menu.StopTimer();
MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","appearance options music") );
SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","appearance options music") );
}
void ScreenAppearanceOptions::ImportOptions()
stepmania/src/ScreenEdit.cpp
+3 -2
View File
@@ -1161,8 +1161,9 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
}
break;
case SDLK_m:
MUSIC->Load( m_pSong->GetMusicPath() );
MUSIC->Play( false, m_pSong->m_fMusicSampleStartSeconds, m_pSong->m_fMusicSampleLengthSeconds );
SOUNDMAN->PlayMusic( m_pSong->GetMusicPath(), false,
m_pSong->m_fMusicSampleStartSeconds,
m_pSong->m_fMusicSampleLengthSeconds );
break;
case SDLK_LEFTBRACKET:
case SDLK_RIGHTBRACKET:
stepmania/src/ScreenSelectMusic.cpp
+3 -6
View File
@@ -710,11 +710,8 @@ void ScreenSelectMusic::AfterMusicChange()
for( pn = 0; pn < NUM_PLAYERS; ++pn)
m_arrayNotes[pn].clear();
int banners_when_fast = 0;
/* If we're rouletting, and we're moving fast, don't touch the banner. */
bool no_banner_change = false;
LOG->Trace("moving %i, roulette %i", m_MusicWheel.IsMoving(), m_MusicWheel.IsRouletting());
if(m_MusicWheel.IsMoving())
{
/* We're moving fast. Don't change banners if we're rouletting, or if
@@ -805,9 +802,9 @@ void ScreenSelectMusic::PlayMusicSample()
Song* pSong = m_MusicWheel.GetSelectedSong();
if( pSong && pSong->HasMusic() )
{
MUSIC->Stop();
MUSIC->Load( pSong->GetMusicPath() );
MUSIC->Play( true, pSong->m_fMusicSampleStartSeconds, pSong->m_fMusicSampleLengthSeconds );
SOUNDMAN->PlayMusic(pSong->GetMusicPath(), true,
pSong->m_fMusicSampleStartSeconds,
pSong->m_fMusicSampleLengthSeconds);
}
// else
// MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","select music music") );