ardour/livetrax
13
0
Fork 0
Code

update Evoral::Curve to honor ControlList::InterpolationStyle

Browse Source
This commit is contained in:
Robin Gareus 2014-05-30 17:00:28 +02:00
parent 161a3258ee
commit c91f847454
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libs/evoral/src/Curve.cpp
View File

@ -402,17 +402,14 @@ 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));
#else // cubic spline
if (!after->coeff) {
return before->value + (vdelta * (tdelta / trange));
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 {
ControlEvent* ev = after;
double x2 = x * x;
return ev->coeff[0] + (ev->coeff[1] * x) + (ev->coeff[2] * x2) + (ev->coeff[3] * x2 * x);
return before->value + (vdelta * (tdelta / trange));
}
#endif
}
/* x is a control point in the data */