DelayWithInterpolation: sample operator now using interpolation class…

…, passes tests. see issue #60
jamoma · Dec 26, 2015 · 7a2365e · 7a2365e
1 parent 3a05941
commit 7a2365e
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/include/objects/JamomaDelay.h b/include/objects/JamomaDelay.h
@@ -104,9 +104,10 @@ namespace Jamoma {
 
         const std::size_t			mCapacity;
         CircularSampleBufferGroup	mHistory;
-        std::size_t                 mIntegralDelay;
-        double                      mFractionalDelay;
-        double                      mOneMinusFractionalDelay;
+        std::size_t                                     mIntegralDelay;
+        double                                          mFractionalDelay;
+        double                                          mOneMinusFractionalDelay;
+        Jamoma::Interpolation::Linear<Jamoma::Sample>   mInterpolation;
 
         // NW: according to TAP this ensures that mHistory is resized when necessary
         Observer				mChannelCountObserver = { std::bind(&DelayWithLinearInterpolation::resizeHistory, this) };
@@ -166,8 +167,9 @@ namespace Jamoma {
         {
             mHistory[channel].resize(size+2); // need delay samples plus 2 "now" samples for interpolation
             mHistory[channel].write(x);
-            return fractionalDelay() * mHistory[channel].tail() +
-                oneMinusFractionalDelay() * mHistory[channel].tail(1);
+            return mInterpolation(mHistory[channel].tail(1),
+                                  mHistory[channel].tail(),
+                                  fractionalDelay());
         }
 
         SharedSampleBundleGroup operator()(const SampleBundle& x)