Merge branch 'master' into audioengine

1 files changed, 7 insertions, 6 deletions

diff --git a/libs/ardour/interpolation.cc b/libs/ardour/interpolation.cc
index fccc805cb0..bccaa45553 100644
--- a/libs/ardour/interpolation.cc
+++ b/libs/ardour/interpolation.cc
@@ -135,17 +135,18 @@ CubicInterpolation::interpolate (int channel, framecnt_t nframes, Sample *input,
 		    inm1 = input[i];
 	    }
 
-    } else {
-
-	    /* not sure that this is ever utilized - it implies that one of the input/output buffers is missing */
+	    i = floor(distance);
+	    phase[channel] = distance - floor(distance);
 
+    } else {
+	    /* used to calculate play-distance with acceleration (silent roll)
+	     * (use same algorithm as real playback for identical rounding/floor'ing)
+	     */
 	    for (framecnt_t outsample = 0; outsample < nframes; ++outsample) {
 		    distance += _speed + acceleration;
 	    }
+	    i = floor(distance);
     }
 
-    i = floor(distance);
-    phase[channel] = distance - floor(distance);
-
     return i;
 }