assert() to help find some possible causes of #2991. Fix some confusion with GTK...

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

diff --git a/libs/ardour/ardour/interpolation.h b/libs/ardour/ardour/interpolation.h
index 06c7ddebe00d20dfcf0d95f67a206ce85e129c94..21a47cfcdc432f4644bacee5a893189f3905786e 100644 (file)
--- a/libs/ardour/ardour/interpolation.h
+++ b/libs/ardour/ardour/interpolation.h
@@ -1,4 +1,6 @@
 #include <math.h>
+#include <samplerate.h>
+
 #include "ardour/types.h"
 
 #ifndef __interpolation_h__
@@ -7,26 +9,45 @@
 namespace ARDOUR {
 
 class Interpolation {
-protected:
-       double   _speed, _target_speed;
-           
-public:
-        Interpolation () : _speed(0.0L) {}
-    
-        void set_speed (double new_speed)          { _speed = new_speed; }
-        void set_target_speed (double new_speed)   { _target_speed = new_speed; }
-
-        double target_speed()          const { return _target_speed; }
-        double speed()                 const { return _speed; }
- 
-        virtual nframes_t interpolate (nframes_t nframes, Sample* input, Sample* output) = 0;
+ protected:
+     double   _speed, _target_speed;
+
+     // the idea is that when the speed is not 1.0, we have to
+     // interpolate between samples and then we have to store where we thought we were.
+     // rather than being at sample N or N+1, we were at N+0.8792922
+     std::vector<double> phase;
+
+
+ public:
+     Interpolation ()  { _speed = 1.0; _target_speed = 1.0; }
+     ~Interpolation () { phase.clear(); }
+
+     void set_speed (double new_speed)          { _speed = new_speed; _target_speed = new_speed; }
+     void set_target_speed (double new_speed)   { _target_speed = new_speed; }
+
+     double target_speed()          const { return _target_speed; }
+     double speed()                 const { return _speed; }
+
+     void add_channel_to (int /*input_buffer_size*/, int /*output_buffer_size*/) { phase.push_back (0.0); }
+     void remove_channel_from () { phase.pop_back (); }
+
+     void reset () {
+         for (size_t i = 0; i < phase.size(); i++) {
+              phase[i] = 0.0;
+          }
+     }
 };
 
 class LinearInterpolation : public Interpolation {
-public:
-        nframes_t interpolate (nframes_t nframes, Sample* input, Sample* output);
+ public:
+     nframes_t interpolate (int channel, nframes_t nframes, Sample* input, Sample* output);
+};
+
+class CubicInterpolation : public Interpolation {
+ public:
+     nframes_t interpolate (int channel, nframes_t nframes, Sample* input, Sample* output);
 };
 
 } // namespace ARDOUR
 
-#endif
\ No newline at end of file
+#endif