From 002b25991d710d448fb555f3cfec5e476fa7ab1b Mon Sep 17 00:00:00 2001 From: "v.audacity" Date: Wed, 11 Jul 2012 04:09:45 +0000 Subject: [PATCH] bug 528 (http://bugzilla.audacityteam.org/show_bug.cgi?id=528, P2) modified version of Martyn's patch --- src/WaveTrack.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/WaveTrack.cpp b/src/WaveTrack.cpp index 4b5b32998..85cc08750 100644 --- a/src/WaveTrack.cpp +++ b/src/WaveTrack.cpp @@ -1752,15 +1752,15 @@ void WaveTrack::GetEnvelopeValues(double *buffer, int bufferLen, if (rt0 < clip->GetStartTime()) { - int dx = (int) floor((clip->GetStartTime() - rt0) / tstep + 0.5); - rbuf += dx; - rlen -= dx; + sampleCount start = clip->GetStartSample(); + rbuf += start; + rlen -= start; rt0 = clip->GetStartTime(); } if (rt0+rlen*tstep > clip->GetEndTime()) { - rlen = (int) ((clip->GetEndTime()-rt0) / tstep); + rlen = clip->GetEndSample() - clip->GetStartSample(); } clip->GetEnvelope()->GetValues(rbuf, rlen, rt0, tstep); }