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 09ae2424906c3b923f66df563caa15fce356ee1b..21a47cfcdc432f4644bacee5a893189f3905786e 100644 (file)
--- a/libs/ardour/ardour/interpolation.h
+++ b/libs/ardour/ardour/interpolation.h
@@ -1,49 +1,53 @@
 #include <math.h>
-//#include "ardour/types.h"
+#include <samplerate.h>
 
-typedef float Sample;
-#define nframes_t uint32_t
+#include "ardour/types.h"
 
-// 40.24 fixpoint math
-#define FIXPOINT_ONE 0x1000000
+#ifndef __interpolation_h__
+#define __interpolation_h__
+
+namespace ARDOUR {
 
 class Interpolation {
-    protected:
-    /// speed in fixed point math
-    uint64_t      phi;
-    
-    /// target speed in fixed point math
-    uint64_t      target_phi;
-    
-    uint64_t      last_phase;
-
-       // Fixed point is just an integer with an implied scaling factor. 
-       // In 40.24 the scaling factor is 2^24 = 16777216,  
-       // so a value of 10*2^24 (in integer space) is equivalent to 10.0. 
-       //
-       // The advantage is that addition and modulus [like x = (x + y) % 2^40]  
-       // have no rounding errors and no drift, and just require a single integer add.
-       // (swh)
-       
-       static const int64_t fractional_part_mask  = 0xFFFFFF;
-       static const Sample  binary_scaling_factor = 16777216.0f;
-    
-    public:
-        Interpolation () : phi (FIXPOINT_ONE), target_phi (FIXPOINT_ONE), last_phase (0) {}
-    
-        void set_speed (double new_speed) {
-            target_phi = (uint64_t) (FIXPOINT_ONE * fabs(new_speed));
-            phi = target_phi;
-        }
-        
-        uint64_t get_phi () const { return phi; }
-        uint64_t get_target_phi () const { return target_phi; }
-        uint64_t get_last_phase () const { return last_phase; }
- 
-        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