Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-01-12 07:35:51 +01:00
Code Issues Releases Wiki Activity

Set the 't' value to where we actually are in the stream, so that we calculate the right warpfactors, avoiding glitches.

Browse Source
This commit is contained in:
martynshaw99
2012-11-15 00:38:43 +00:00
parent a908ace018
commit 4b9a934ab4
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Mix.cpp
View File

@@ -378,7 +378,7 @@ sampleCount Mixer::MixVariableRates(int *channelFlags, WaveTrack *track,
double trackRate = track->GetRate(); double trackRate = track->GetRate();
double initialWarp = mRate / trackRate; double initialWarp = mRate / trackRate;
double tstep = 1.0 / trackRate; double tstep = 1.0 / trackRate;
double t = *pos / trackRate; double t = (*pos - *queueLen) / trackRate;
int sampleSize = SAMPLE_SIZE(floatSample); int sampleSize = SAMPLE_SIZE(floatSample);
sampleCount out = 0; sampleCount out = 0;
@@ -580,8 +580,7 @@ sampleCount Mixer::Process(sampleCount maxToProcess)
} }
} }
if (mTimeTrack || if (mTimeTrack || track->GetRate() != mRate)
track->GetRate() != mRate)
out = MixVariableRates(channelFlags, track, out = MixVariableRates(channelFlags, track,
&mSamplePos[i], mSampleQueue[i], &mSamplePos[i], mSampleQueue[i],
&mQueueStart[i], &mQueueLen[i], mResample[i]); &mQueueStart[i], &mQueueLen[i], mResample[i]);