From 5aecc877d6db356547e98538c44936e183842c86 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Fri, 30 May 2014 04:25:59 +0200 Subject: Fix code to prepare re-enable cubic spline interpolation of automation data. see also 24917e4c9e36ca57 --- libs/evoral/src/Curve.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/libs/evoral/src/Curve.cpp b/libs/evoral/src/Curve.cpp index 44fc48f728..239339e508 100644 --- a/libs/evoral/src/Curve.cpp +++ b/libs/evoral/src/Curve.cpp @@ -402,16 +402,17 @@ Curve::multipoint_eval (double x) double tdelta = x - before->when; double trange = after->when - before->when; - +#if 1 // Linear Interpolation 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); +#else // cubic spline + if (!after->coeff) { + return before->value + (vdelta * (tdelta / trange)); + } else { + ControlEvent* ev = after; + double x2 = x * x; + return ev->coeff[0] + (ev->coeff[1] * x) + (ev->coeff[2] * x2) + (ev->coeff[3] * x2 * x); + } #endif - } /* x is a control point in the data */ -- cgit v1.2.3