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

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2004-01-10 10:54:11 +00:00
parent ee9d893669
commit fe15e6c934
1 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSounds.cpp
+35 -35
View File
@@ -94,43 +94,43 @@ void StartQueuedMusic( const RageTimer &when )
void RageSounds::Update( float fDeltaTime ) void RageSounds::Update( float fDeltaTime )
{ {
if( g_UpdatingTimer ) if( !g_UpdatingTimer )
return;
if( !g_Music->IsPlaying() )
{ {
if( g_Music->IsPlaying() ) /* There's no song playing. Fake it. */
{ GAMESTATE->UpdateSongPosition( GAMESTATE->m_fMusicSeconds + fDeltaTime, g_Timing );
/* There's a delay between us calling Play() and the sound actually playing. return;
* During this time, approximate will be true. Keep using the previous timing
* data until we get a non-approximate time, indicating that the sound has actually
* started playing. */
bool approximate;
const float fSeconds = g_Music->GetPositionSeconds( &approximate );
if( g_TimingDelayed && !approximate )
{
/* We've passed the start position of the new sound, so we should be OK.
* Load up the new timing data. */
g_Timing = g_MusicToPlay.timing;
g_TimingDelayed = false;
}
RageTimer now;
now.Touch();
if( approximate )
{
/* We're still waiting for the new sound to start playing, so keep using the
* old timing data and fake the time. */
GAMESTATE->UpdateSongPosition( GAMESTATE->m_fMusicSeconds + fDeltaTime, g_Timing );
}
else
GAMESTATE->UpdateSongPosition( fSeconds, g_Timing );
}
else
{
/* There's no song playing. Fake it. */
GAMESTATE->UpdateSongPosition( GAMESTATE->m_fMusicSeconds + fDeltaTime, g_Timing );
}
} }
/* There's a delay between us calling Play() and the sound actually playing.
* During this time, approximate will be true. Keep using the previous timing
* data until we get a non-approximate time, indicating that the sound has actually
* started playing. */
bool approximate;
const float fSeconds = g_Music->GetPositionSeconds( &approximate );
if( g_TimingDelayed && !approximate )
{
/* We've passed the start position of the new sound, so we should be OK.
* Load up the new timing data. */
g_Timing = g_MusicToPlay.timing;
g_TimingDelayed = false;
}
RageTimer now;
now.Touch();
if( approximate )
{
/* We're still waiting for the new sound to start playing, so keep using the
* old timing data and fake the time. */
GAMESTATE->UpdateSongPosition( GAMESTATE->m_fMusicSeconds + fDeltaTime, g_Timing );
return;
}
GAMESTATE->UpdateSongPosition( fSeconds, g_Timing );
} }