Revert cc08cfc, it's unimportant to other work and it made scrub clicky

This commit is contained in:
Paul Licameli 2018-08-09 19:31:52 -04:00
parent 5dab364f15
commit 072b711353
1 changed files with 14 additions and 6 deletions

View File

@ -708,7 +708,20 @@ double Mixer::MixGetCurrentTime()
void Mixer::Restart()
{
Reposition( mT0 );
mTime = mT0;
for(size_t i=0; i<mNumInputTracks; i++)
mSamplePos[i] = mInputTrack[i].GetTrack()->TimeToLongSamples(mT0);
for(size_t i=0; i<mNumInputTracks; i++) {
mQueueStart[i] = 0;
mQueueLen[i] = 0;
}
// Bug 1887: libsoxr 0.1.3, first used in Audacity 2.3.0, crashes with
// constant rate resampling if you try to reuse the resampler after it has
// flushed. Should that be considered a bug in sox? This works around it:
MakeResamplers();
}
void Mixer::Reposition(double t)
@ -725,11 +738,6 @@ void Mixer::Reposition(double t)
mQueueStart[i] = 0;
mQueueLen[i] = 0;
}
// Bug 1887: libsoxr 0.1.3, first used in Audacity 2.3.0, crashes with
// constant rate resampling if you try to reuse the resampler after it has
// flushed. Should that be considered a bug in sox? This works around it:
MakeResamplers();
}
void Mixer::SetTimesAndSpeed(double t0, double t1, double speed)