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

Fix interaction between global offset and music rate.

Browse Source 
The global offset is a correction for audio latency, which is measured
in wall-clock time, but TimingData elapsed time values represent offsets
into the sound file.  To get the offset in the sound file that
corresponds to the wall-clock time of the global offset, we have to
multiply by the music rate.
This commit is contained in:
Matt McCutchen
2015-10-03 22:21:21 -04:00
parent 8b08c7c182
commit 343bbd0e56
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/TimingData.cpp
+4 -2
View File
@@ -1,6 +1,7 @@
#include "global.h" #include "global.h"
#include "TimingData.h" #include "TimingData.h"
#include "PrefsManager.h" #include "PrefsManager.h"
#include "GameState.h"
#include "RageUtil.h" #include "RageUtil.h"
#include "RageLog.h" #include "RageLog.h"
#include "ThemeManager.h" #include "ThemeManager.h"
@@ -704,7 +705,7 @@ bool TimingData::DoesLabelExist( const RString& sLabel ) const
void TimingData::GetBeatAndBPSFromElapsedTime(GetBeatArgs& args) const void TimingData::GetBeatAndBPSFromElapsedTime(GetBeatArgs& args) const
{ {
args.elapsed_time += PREFSMAN->m_fGlobalOffsetSeconds; args.elapsed_time += GAMESTATE->m_SongOptions.GetCurrent().m_fMusicRate * PREFSMAN->m_fGlobalOffsetSeconds;
GetBeatAndBPSFromElapsedTimeNoOffset(args); GetBeatAndBPSFromElapsedTimeNoOffset(args);
} }
@@ -945,7 +946,8 @@ float TimingData::GetElapsedTimeInternal(GetBeatStarts& start, float beat,
float TimingData::GetElapsedTimeFromBeat( float fBeat ) const float TimingData::GetElapsedTimeFromBeat( float fBeat ) const
{ {
return TimingData::GetElapsedTimeFromBeatNoOffset( fBeat ) - PREFSMAN->m_fGlobalOffsetSeconds; return TimingData::GetElapsedTimeFromBeatNoOffset( fBeat )
- GAMESTATE->m_SongOptions.GetCurrent().m_fMusicRate * PREFSMAN->m_fGlobalOffsetSeconds;
} }
float TimingData::GetElapsedTimeFromBeatNoOffset( float fBeat ) const float TimingData::GetElapsedTimeFromBeatNoOffset( float fBeat ) const