debug flag for MTC; make ardour/timecode.h simply include the "authoritative" one...

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

diff --git a/libs/ardour/ardour/interpolation.h b/libs/ardour/ardour/interpolation.h
index d0ba3c48bc87973bcd7f9fe7a0b1f27ac1189e4c..21a47cfcdc432f4644bacee5a893189f3905786e 100644 (file)
--- a/libs/ardour/ardour/interpolation.h
+++ b/libs/ardour/ardour/interpolation.h
@@ -9,30 +9,45 @@
 namespace ARDOUR {
 
 class Interpolation {
-protected:
-       double   _speed;
-       
-       SRC_STATE*            state;
-       std::vector<SRC_DATA> data;
-       
-       int        error;
-       
-       void reset_state ();
-       
-public:
-        Interpolation ();
-        ~Interpolation ();
-    
-        void   set_speed (double new_speed);
-        void   set_target_speed (double new_speed)   {}
-        double speed ()                        const { return _speed;      }
-        
-        void add_channel_to (int input_buffer_size, int output_buffer_size);
-        void remove_channel_from (); 
- 
-        nframes_t interpolate (int channel, nframes_t nframes, Sample* input, Sample* output);
+ 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 (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