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

simplify and clarify

Browse Source
This commit is contained in:
Glenn Maynard
2005-04-28 23:25:30 +00:00
parent 9539e03bdc
commit f56990b3fb
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameSoundManager.cpp
+19 -15
View File
@@ -484,6 +484,25 @@ void GameSoundManager::Update( float fDeltaTime )
RageTimer tm; RageTimer tm;
const float fSeconds = g_Playing->m_Music->GetPositionSeconds( &approximate, &tm ); const float fSeconds = g_Playing->m_Music->GetPositionSeconds( &approximate, &tm );
//
// Check for song timing skips.
//
if( PREFSMAN->m_bLogSkips && !g_Playing->m_TimingDelayed )
{
const float fExpectedTimePassed = (tm - GAMESTATE->m_LastBeatUpdate) * g_Playing->m_Music->GetPlaybackRate();
const float fSoundTimePassed = fSeconds - GAMESTATE->m_fMusicSeconds;
const float fDiff = fExpectedTimePassed - fSoundTimePassed;
static CString sLastFile = "";
const CString ThisFile = g_Playing->m_Music->GetLoadedFilePath();
/* If fSoundTimePassed < 0, the sound has probably looped. */
if( sLastFile == ThisFile && fSoundTimePassed >= 0 && fabsf(fDiff) > 0.003f )
LOG->Trace("Song position skip in %s: expected %.3f, got %.3f (cur %f, prev %f) (%.3f difference)",
Basename(ThisFile).c_str(), fExpectedTimePassed, fSoundTimePassed, fSeconds, GAMESTATE->m_fMusicSeconds, fDiff );
sLastFile = ThisFile;
}
if( g_Playing->m_TimingDelayed ) if( g_Playing->m_TimingDelayed )
{ {
if( approximate ) if( approximate )
@@ -502,21 +521,6 @@ void GameSoundManager::Update( float fDeltaTime )
g_Playing->m_TimingDelayed = false; g_Playing->m_TimingDelayed = false;
} }
} }
else if( PREFSMAN->m_bLogSkips )
{
const float fExpectedTimePassed = (tm - GAMESTATE->m_LastBeatUpdate) * g_Playing->m_Music->GetPlaybackRate();
const float fSoundTimePassed = fSeconds - GAMESTATE->m_fMusicSeconds;
const float fDiff = fExpectedTimePassed - fSoundTimePassed;
static CString sLastFile = "";
const CString ThisFile = g_Playing->m_Music->GetLoadedFilePath();
/* If fSoundTimePassed < 0, the sound has probably looped. */
if( sLastFile == ThisFile && fSoundTimePassed >= 0 && fabsf(fDiff) > 0.003f )
LOG->Trace("Song position skip in %s: expected %.3f, got %.3f (cur %f, prev %f) (%.3f difference)",
Basename(ThisFile).c_str(), fExpectedTimePassed, fSoundTimePassed, fSeconds, GAMESTATE->m_fMusicSeconds, fDiff );
sLastFile = ThisFile;
}
CHECKPOINT_M( ssprintf("%f", fSeconds) ); CHECKPOINT_M( ssprintf("%f", fSeconds) );
GAMESTATE->UpdateSongPosition( fSeconds+fAdjust, g_Playing->m_Timing, tm+fAdjust ); GAMESTATE->UpdateSongPosition( fSeconds+fAdjust, g_Playing->m_Timing, tm+fAdjust );