Merge branch 'master' into windows

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

diff --git a/libs/evoral/src/Curve.cpp b/libs/evoral/src/Curve.cpp
index 42f0eee49c5ab9046a96459ba88a1a29d0dbde5a..44fc48f7282c168d7f31f3d70a7fa7234089cea8 100644 (file)
--- a/libs/evoral/src/Curve.cpp
+++ b/libs/evoral/src/Curve.cpp
@@ -22,8 +22,9 @@
 #include <climits>
 #include <cfloat>
 #include <cmath>
+#include <vector>
 
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
 
 #include "evoral/Curve.hpp"
 #include "evoral/ControlList.hpp"
@@ -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;
 
@@ -170,7 +171,7 @@ Curve::solve ()
 bool
 Curve::rt_safe_get_vector (double x0, double x1, float *vec, int32_t veclen)
 {
-       Glib::Mutex::Lock lm(_list.lock(), Glib::TRY_LOCK);
+       Glib::Threads::Mutex::Lock lm(_list.lock(), Glib::Threads::TRY_LOCK);
 
        if (!lm.locked()) {
                return false;
@@ -183,7 +184,7 @@ Curve::rt_safe_get_vector (double x0, double x1, float *vec, int32_t veclen)
 void
 Curve::get_vector (double x0, double x1, float *vec, int32_t veclen)
 {
-       Glib::Mutex::Lock lm(_list.lock());
+       Glib::Threads::Mutex::Lock lm(_list.lock());
        _get_vector (x0, x1, vec, veclen);
 }
 
@@ -195,25 +196,47 @@ Curve::_get_vector (double x0, double x1, float *vec, int32_t veclen)
        int32_t original_veclen;
        int32_t npoints;
 
+       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;
        }
 
+       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;
 
@@ -224,16 +247,16 @@ Curve::_get_vector (double x0, double x1, float *vec, int32_t veclen)
                */
 
                double frac = (min_x - x0) / (x1 - x0);
-               int32_t subveclen = (int32_t) floor (veclen * frac);
+               int64_t fill_len = (int64_t) floor (veclen * frac);
 
-               subveclen = min (subveclen, veclen);
+               fill_len = min (fill_len, (int64_t)veclen);
 
-               for (i = 0; i < subveclen; ++i) {
+               for (i = 0; i < fill_len; ++i) {
                        vec[i] = _list.events().front()->value;
                }
 
-               veclen -= subveclen;
-               vec += subveclen;
+               veclen -= fill_len;
+               vec += fill_len;
        }
 
        if (veclen && x1 > max_x) {
@@ -241,36 +264,21 @@ Curve::_get_vector (double x0, double x1, float *vec, int32_t veclen)
                /* fill some end section of the array with the default or final value */
 
                double frac = (x1 - max_x) / (x1 - x0);
-
-               int32_t subveclen = (int32_t) floor (original_veclen * frac);
-
+               int64_t fill_len = (int64_t) floor (original_veclen * frac);
                float val;
 
-               subveclen = min (subveclen, veclen);
-
+               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;
                }
 
-               veclen -= subveclen;
-       }
-
-       if (veclen == 0) {
-               return;
-       }
-
-       if (npoints == 1) {
-
-               for (i = 0; i < veclen; ++i) {
-                       vec[i] = _list.events().front()->value;
-               }
-               return;
+               veclen -= fill_len;
        }
 
+       lx = max (min_x, x0);
+       hx = min (max_x, x1);
 
        if (npoints == 2) {
 
@@ -301,7 +309,7 @@ Curve::_get_vector (double x0, double x1, float *vec, int32_t veclen)
                                vec[i] = (lx * (m_num / m_den) + m_num * i * dx_num / (m_den * dx_den)) + c;
                        }
                } else {
-                       vec[i] = lx;
+                       vec[0] = lx;
                }
 
                return;
@@ -374,7 +382,7 @@ Curve::multipoint_eval (double x)
                if (range.first == _list.events().begin()) {
                        /* we're before the first point */
                        // return default_value;
-                       _list.events().front()->value;
+                       return _list.events().front()->value;
                }
 
                if (range.second == _list.events().end()) {
@@ -382,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 */