clean up debugging

[ardour.git] / libs / ardour / interpolation.cc

diff --git a/libs/ardour/interpolation.cc b/libs/ardour/interpolation.cc
index 47e3642bf338d69dbd4644d2434e4a8c79e29f28..0a9bbc3a7d731a629433bd3ba97ac2f57ec46d09 100644 (file)
--- a/libs/ardour/interpolation.cc
+++ b/libs/ardour/interpolation.cc
@@ -6,11 +6,11 @@
 using namespace ARDOUR;
 
 
-nframes_t
-LinearInterpolation::interpolate (int channel, nframes_t nframes, Sample *input, Sample *output)
+framecnt_t
+LinearInterpolation::interpolate (int channel, framecnt_t nframes, Sample *input, Sample *output)
 {
        // index in the input buffers
-       nframes_t   i = 0;
+       framecnt_t   i = 0;
 
        double acceleration;
        double distance = 0.0;
@@ -22,7 +22,7 @@ LinearInterpolation::interpolate (int channel, nframes_t nframes, Sample *input,
        }
 
        distance = phase[channel];
-       for (nframes_t outsample = 0; outsample < nframes; ++outsample) {
+       for (framecnt_t outsample = 0; outsample < nframes; ++outsample) {
                i = floor(distance);
                Sample fractional_phase_part = distance - i;
                if (fractional_phase_part >= 1.0) {
@@ -45,11 +45,11 @@ LinearInterpolation::interpolate (int channel, nframes_t nframes, Sample *input,
        return i;
 }
 
-nframes_t
-CubicInterpolation::interpolate (int channel, nframes_t nframes, Sample *input, Sample *output)
+framecnt_t
+CubicInterpolation::interpolate (int channel, framecnt_t nframes, Sample *input, Sample *output)
 {
     // index in the input buffers
-    nframes_t   i = 0;
+    framecnt_t   i = 0;
 
     double acceleration;
     double distance = 0.0;
@@ -87,7 +87,7 @@ CubicInterpolation::interpolate (int channel, nframes_t nframes, Sample *input,
                    inm1 = input[i-1];
            }
 
-           for (nframes_t outsample = 0; outsample < nframes; ++outsample) {
+           for (framecnt_t outsample = 0; outsample < nframes; ++outsample) {
 
                    float f = floor (distance);
                    float fractional_phase_part = distance - f;
@@ -117,13 +117,14 @@ CubicInterpolation::interpolate (int channel, nframes_t nframes, Sample *input,
                                                                fractional_phase_part * (3.0f * (input[i] - input[i+1]) - inm1 + input[i+2])));
 
                    distance += _speed + acceleration;
+                   inm1 = input[i];
            }
 
     } else {
 
            /* not sure that this is ever utilized - it implies that one of the input/output buffers is missing */
 
-           for (nframes_t outsample = 0; outsample < nframes; ++outsample) {
+           for (framecnt_t outsample = 0; outsample < nframes; ++outsample) {
                    distance += _speed + acceleration;
            }
     }