Merge branch 'master' into cairocanvas

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

diff --git a/libs/evoral/src/Curve.cpp b/libs/evoral/src/Curve.cpp
index b59d4735bf16245cf2276bdec12848494c1053ff..44fc48f7282c168d7f31f3d70a7fa7234089cea8 100644 (file)
--- a/libs/evoral/src/Curve.cpp
+++ b/libs/evoral/src/Curve.cpp
@@ -22,6 +22,7 @@
 #include <climits>
 #include <cfloat>
 #include <cmath>
+#include <vector>
 
 #include <glibmm/threads.h>
 
@@ -56,8 +57,8 @@ Curve::solve ()
                   (www.korf.co.uk/spline.pdf) for more details.
                */
 
-               double x[npoints];
-               double y[npoints];
+               vector<double> x(npoints);
+               vector<double> y(npoints);
                uint32_t i;
                ControlList::EventList::const_iterator xx;
 
@@ -195,34 +196,50 @@ Curve::_get_vector (double x0, double x1, float *vec, int32_t veclen)
        int32_t original_veclen;
        int32_t npoints;
 
-       cerr << "Check1: veclen = " << veclen << endl;
+       if (veclen == 0) {
+               return;
+       }
 
        if ((npoints = _list.events().size()) == 0) {
-               for (i = 0; i < veclen; ++i) {
+               /* no events in list, so just fill the entire array with the default value */
+               for (int32_t i = 0; i < veclen; ++i) {
                        vec[i] = _list.default_value();
                }
                return;
        }
 
-       cerr << "Check2: veclen = " << veclen << endl;
+       if (npoints == 1) {
+               for (int32_t i = 0; i < veclen; ++i) {
+                       vec[i] = _list.events().front()->value;
+               }
+               return;
+       }
 
        /* events is now known not to be empty */
 
        max_x = _list.events().back()->when;
        min_x = _list.events().front()->when;
 
-       lx = max (min_x, x0);
-
-       if (x1 < 0) {
-               x1 = _list.events().back()->when;
+       if (x0 > max_x) {
+               /* totally past the end - just fill the entire array with the final value */    
+               for (int32_t i = 0; i < veclen; ++i) {
+                       vec[i] = _list.events().back()->value;
+               }
+               return;
        }
 
-       hx = min (max_x, x1);
+       if (x1 < min_x) {
+               /* totally before the first event - fill the entire array with
+                * the initial value.
+                */
+               for (int32_t i = 0; i < veclen; ++i) {
+                       vec[i] = _list.events().front()->value;
+               }
+               return;
+       }
 
        original_veclen = veclen;
 
-       cerr << "Check3: veclen = " << veclen << endl;
-
        if (x0 < min_x) {
 
                /* fill some beginning section of the array with the
@@ -230,72 +247,38 @@ Curve::_get_vector (double x0, double x1, float *vec, int32_t veclen)
                */
 
                double frac = (min_x - x0) / (x1 - x0);
-               int64_t subveclen = (int64_t) floor (veclen * frac);
+               int64_t fill_len = (int64_t) floor (veclen * frac);
 
-               cerr << "subveclen = " << subveclen << endl;
+               fill_len = min (fill_len, (int64_t)veclen);
 
-               subveclen = min (subveclen, (int64_t)veclen);
-               
-               cerr << "subveclen2 = " << subveclen << endl;
-
-               for (i = 0; i < subveclen; ++i) {
+               for (i = 0; i < fill_len; ++i) {
                        vec[i] = _list.events().front()->value;
                }
 
-               cerr << "adjust veclen from " << veclen << " to ";
-               veclen -= subveclen;
-               cerr << veclen << endl;
-               vec += subveclen;
+               veclen -= fill_len;
+               vec += fill_len;
        }
 
-       cerr << "Check4: veclen = " << veclen << endl;
-
        if (veclen && x1 > max_x) {
 
                /* fill some end section of the array with the default or final value */
 
                double frac = (x1 - max_x) / (x1 - x0);
-               
-               cerr << "compute subveclen from " << original_veclen << " * " << frac
-                    << " taken from " << x0 << " .. " << x0 
-                    << endl;
-
-               int64_t subveclen = (int64_t) floor (original_veclen * frac);
-
+               int64_t fill_len = (int64_t) floor (original_veclen * frac);
                float val;
 
-               cerr << "subveclen3 = " << subveclen << endl;
-               subveclen = min (subveclen, (int64_t)veclen);
-
-               cerr << "subveclen4 = " << subveclen << endl;
+               fill_len = min (fill_len, (int64_t)veclen);
                val = _list.events().back()->value;
 
-               i = veclen - subveclen;
-
-               for (i = veclen - subveclen; i < veclen; ++i) {
+               for (i = veclen - fill_len; i < veclen; ++i) {
                        vec[i] = val;
                }
 
-               cerr << "adjust veclen2 from " << veclen << " to ";
-               veclen -= subveclen;
-               cerr << veclen << endl;
+               veclen -= fill_len;
        }
 
-       cerr << "Check5: veclen = " << veclen << endl;
-
-       if (veclen == 0) {
-               return;
-       }
-
-       if (npoints == 1) {
-
-               for (i = 0; i < veclen; ++i) {
-                       vec[i] = _list.events().front()->value;
-               }
-               return;
-       }
-
-       cerr << "Check6: veclen = " << veclen << endl;
+       lx = max (min_x, x0);
+       hx = min (max_x, x1);
 
        if (npoints == 2) {
 
@@ -332,14 +315,10 @@ Curve::_get_vector (double x0, double x1, float *vec, int32_t veclen)
                return;
        }
 
-       cerr << "Check7: veclen = " << veclen << endl;
-       
        if (_dirty) {
                solve ();
        }
 
-       cerr << "Check8: veclen = " << veclen << endl;
-
        rx = lx;
 
        double dx = 0;
@@ -347,8 +326,6 @@ Curve::_get_vector (double x0, double x1, float *vec, int32_t veclen)
                dx = (hx - lx) / (veclen - 1);
        }
 
-       cerr << "Check9: veclen = " << veclen << endl;
-
        for (i = 0; i < veclen; ++i, rx += dx) {
                vec[i] = multipoint_eval (rx);
        }
@@ -413,10 +390,28 @@ Curve::multipoint_eval (double x)
                        return _list.events().back()->value;
                }
 
+               ControlEvent* after = (*range.second);
+               range.second--;
+               ControlEvent* before = (*range.second);
+
+               double vdelta = after->value - before->value;
+
+               if (vdelta == 0.0) {
+                       return before->value;
+               }
+
+               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);
+               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 */