Remove some aborts that don't really need to be.

[ardour.git] / libs / evoral / src / Curve.cpp

diff --git a/libs/evoral/src/Curve.cpp b/libs/evoral/src/Curve.cpp
index 44fc48f7282c168d7f31f3d70a7fa7234089cea8..20cc5d9ec3a088b9f5ca311621d08f9c1e97e9b0 100644 (file)
--- a/libs/evoral/src/Curve.cpp
+++ b/libs/evoral/src/Curve.cpp
@@ -403,15 +403,13 @@ Curve::multipoint_eval (double x)
                double tdelta = x - before->when;
                double trange = after->when - before->when;
 
-               return before->value + (vdelta * (tdelta / trange));
-
-#if 0
-               double x2 = x * x;
-               ControlEvent* ev = *range.second;
-
-               return = ev->coeff[0] + (ev->coeff[1] * x) + (ev->coeff[2] * x2) + (ev->coeff[3] * x2 * x);
-#endif
-
+               if (_list.interpolation() == ControlList::Curved && after->coeff) {
+                               ControlEvent* ev = after;
+                               double x2 = x * x;
+                               return ev->coeff[0] + (ev->coeff[1] * x) + (ev->coeff[2] * x2) + (ev->coeff[3] * x2 * x);
+               } else {
+                       return before->value + (vdelta * (tdelta / trange));
+               }
        }
 
        /* x is a control point in the data */