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

Minor sync fix when using playback rates.

Browse Source
This commit is contained in:
Glenn Maynard
2003-10-03 08:48:34 +00:00
parent 9c0f586073
commit eb46c45567
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSound.cpp
+7 -7
View File
@@ -565,16 +565,15 @@ float RageSound::GetPositionSecondsInternal() const
{ {
if(stopped_position != -1) if(stopped_position != -1)
return stopped_position; return stopped_position;
return GetPlaybackRate() * position / float(samplerate()); return position / float(samplerate());
} }
/* If we don't yet have any position data, GetPCM hasn't yet been called at all, /* If we don't yet have any position data, GetPCM hasn't yet been called at all,
* so report the static position. */ * so report the static position. */
if(pos_map.empty())
{ {
if(pos_map.empty()) {
LOG->Trace("no data yet; %i", position); LOG->Trace("no data yet; %i", position);
return GetPlaybackRate() * position / float(samplerate()); return position / float(samplerate());
}
} }
/* Get our current hardware position. */ /* Get our current hardware position. */
@@ -591,7 +590,7 @@ float RageSound::GetPositionSecondsInternal() const
/* cur_sample lies in this block; it's an exact match. Figure /* cur_sample lies in this block; it's an exact match. Figure
* out the exact position. */ * out the exact position. */
int diff = pos_map[i].position - pos_map[i].sampleno; int diff = pos_map[i].position - pos_map[i].sampleno;
return GetPlaybackRate() * float(cur_sample + diff) / samplerate(); return float(cur_sample + diff) / samplerate();
} }
/* See if the current position is close to the beginning of this block. */ /* See if the current position is close to the beginning of this block. */
@@ -622,12 +621,13 @@ float RageSound::GetPositionSecondsInternal() const
*/ */
LOG->Trace("Approximate sound time: sample %i, dist %i, closest %i", cur_sample, closest_position_dist, closest_position); LOG->Trace("Approximate sound time: sample %i, dist %i, closest %i", cur_sample, closest_position_dist, closest_position);
return GetPlaybackRate() * closest_position / float(samplerate()); return closest_position / float(samplerate());
} }
float RageSound::GetPositionSeconds() const float RageSound::GetPositionSeconds() const
{ {
return GetPositionSecondsInternal() + Sample->GetOffsetFix(); const float ret = GetPositionSecondsInternal() + Sample->GetOffsetFix();
return GetPlaybackRate() * ret;
} }