diff options
author | Robin Gareus <robin@gareus.org> | 2014-05-30 04:25:59 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2014-05-30 04:25:59 +0200 |
commit | 5aecc877d6db356547e98538c44936e183842c86 (patch) | |
tree | 4aeb2aaaef2fcc0cd567b1291b448fb0dbc55458 | |
parent | e69057319e29992c43dd69fb0e2bb29bb4001714 (diff) |
Fix code to prepare re-enable cubic spline interpolation of automation data.
see also 24917e4c9e36ca57
-rw-r--r-- | libs/evoral/src/Curve.cpp | 17 |
1 files 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 */ |