diff options
author | Robin Gareus <robin@gareus.org> | 2013-08-27 20:55:15 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2013-08-27 20:55:15 +0200 |
commit | 486483366926e45c8236c26915dd417d8bb404dd (patch) | |
tree | df30a694043d01c9f7d91d7435563f777e2a71dd | |
parent | 1d972d05c5e889e4358d18ec6ba0c8e2e11a64e4 (diff) |
fix vari-speed phase (when used for calculation only)
and clarify an old comment.
-rw-r--r-- | libs/ardour/interpolation.cc | 13 |
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; } |