mirror of
https://github.com/ppy/osu.git
synced 2025-01-27 15:43:21 +08:00
Fix interpolation not being applied when applyOffsets
is set
This commit is contained in:
parent
117cd74af6
commit
04e6ec8715
@ -74,11 +74,13 @@ namespace osu.Game.Beatmaps
|
|||||||
// high precision times (on windows there's generally only 5-10ms reporting intervals, as an example).
|
// high precision times (on windows there's generally only 5-10ms reporting intervals, as an example).
|
||||||
decoupledTrack = new DecouplingClock();
|
decoupledTrack = new DecouplingClock();
|
||||||
|
|
||||||
|
var interpolatedTrack = new InterpolatingFramedClock(decoupledTrack);
|
||||||
|
|
||||||
if (applyOffsets)
|
if (applyOffsets)
|
||||||
{
|
{
|
||||||
// Audio timings in general with newer BASS versions don't match stable.
|
// Audio timings in general with newer BASS versions don't match stable.
|
||||||
// This only seems to be required on windows. We need to eventually figure out why, with a bit of luck.
|
// This only seems to be required on windows. We need to eventually figure out why, with a bit of luck.
|
||||||
platformOffsetClock = new OffsetCorrectionClock(decoupledTrack, ExternalPauseFrequencyAdjust) { Offset = RuntimeInfo.OS == RuntimeInfo.Platform.Windows ? 15 : 0 };
|
platformOffsetClock = new OffsetCorrectionClock(interpolatedTrack, ExternalPauseFrequencyAdjust) { Offset = RuntimeInfo.OS == RuntimeInfo.Platform.Windows ? 15 : 0 };
|
||||||
|
|
||||||
// User global offset (set in settings) should also be applied.
|
// User global offset (set in settings) should also be applied.
|
||||||
userGlobalOffsetClock = new OffsetCorrectionClock(platformOffsetClock, ExternalPauseFrequencyAdjust);
|
userGlobalOffsetClock = new OffsetCorrectionClock(platformOffsetClock, ExternalPauseFrequencyAdjust);
|
||||||
@ -88,7 +90,7 @@ namespace osu.Game.Beatmaps
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
finalClockSource = new InterpolatingFramedClock(decoupledTrack);
|
finalClockSource = new InterpolatingFramedClock(interpolatedTrack);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user