Tidy, remove dead code.

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

diff --git a/libs/evoral/src/ControlList.cpp b/libs/evoral/src/ControlList.cpp
index b8388f375361d3f7228a2962fbc82dd24ecf0e4a..22517e68a06c81e500cf7b9cdb1881a2851e8bcb 100644 (file)
--- a/libs/evoral/src/ControlList.cpp
+++ b/libs/evoral/src/ControlList.cpp
@@ -758,31 +758,23 @@ ControlList::unlocked_eval (double x) const
        double fraction;
 
        const_iterator length_check_iter = _events.begin();
-       for (npoints = 0; npoints < 4; ++npoints, ++length_check_iter)
-               if (length_check_iter == _events.end())
+       for (npoints = 0; npoints < 4; ++npoints, ++length_check_iter) {
+               if (length_check_iter == _events.end()) {
                        break;
+               }
+       }
 
        switch (npoints) {
        case 0:
                return _default_value;
 
        case 1:
-               if (x >= _events.front()->when) {
-                       return _events.front()->value;
-               } else {
-                       // hansfbaier: v--------- Why commented ??? 
-                       // return _default_value;
-                       return _events.front()->value;
-               } 
+               return _events.front()->value;
                
        case 2:
                if (x >= _events.back()->when) {
                        return _events.back()->value;
-               } else if (x == _events.front()->when) {
-                       return _events.front()->value;
-               } else if (x < _events.front()->when) {
-                       // hansfbaier: v--------- Why commented ??? 
-                       // return _default_value;
+               } else if (x <= _events.front()->when) {
                        return _events.front()->value;
                }
 
@@ -795,30 +787,22 @@ ControlList::unlocked_eval (double x) const
                        return lval;
                }
 
-               /* linear interpolation betweeen the two points
-               */
-
+               /* linear interpolation betweeen the two points */
                fraction = (double) (x - lpos) / (double) (upos - lpos);
                return lval + (fraction * (uval - lval));
 
        default:
-
                if (x >= _events.back()->when) {
                        return _events.back()->value;
-               } else if (x == _events.front()->when) {
-                       return _events.front()->value;
-               } else if (x < _events.front()->when) {
-                       // hansfbaier: v--------- Why commented ??? 
-                       // return _default_value;
+               } else if (x <= _events.front()->when) {
                        return _events.front()->value;
                }
 
                return multipoint_eval (x);
-               break;
        }
 
        /*NOTREACHED*/ /* stupid gcc */
-       return 0.0;
+       return _default_value;
 }
 
 double
@@ -1009,7 +993,8 @@ ControlList::rt_safe_earliest_event_discrete_unlocked (double start, double end,
 bool
 ControlList::rt_safe_earliest_event_linear_unlocked (double start, double end, double& x, double& y, bool inclusive) const
 {
-       //cerr << "earliest_event(" << start << ", " << end << ", " << x << ", " << y << ", " << inclusive << endl;
+       //cerr << "earliest_event(start: " << start << ", end: " << end
+       //<< ", x: " << x << ", y: " << y << ", inclusive: " << inclusive <<  ")" << endl;
 
        const_iterator length_check_iter = _events.begin();
        if (_events.empty()) // 0 events
@@ -1052,12 +1037,12 @@ ControlList::rt_safe_earliest_event_linear_unlocked (double start, double end, d
                         * (Optimize for immediate call this cycle within range) */
                        _search_cache.left = x;
                        //++_search_cache.range.first;
-                       assert(inclusive ? x >= start : x > start);
+                       assert(x >= start);
                        return true;
                }
                        
                if (fabs(first->value - next->value) <= 1) {
-                       if (next->when <= end && (!inclusive || next->when > start)) {
+                       if (next->when <= end && (next->when > start)) {
                                x = next->when;
                                y = next->value;
                                /* Move left of cache to this point
@@ -1094,9 +1079,9 @@ ControlList::rt_safe_earliest_event_linear_unlocked (double start, double end, d
                        x = first->when + (y - first->value) / (double)slope;
                }
 
-               /*cerr << first->value << " @ " << first->when << " ... "
+               cerr << first->value << " @ " << first->when << " ... "
                                << next->value << " @ " << next->when
-                               << " = " << y << " @ " << x << endl;*/
+                               << " = " << y << " @ " << x << endl;
 
                assert(    (y >= first->value && y <= next->value)
                                || (y <= first->value && y >= next->value) );
@@ -1301,8 +1286,10 @@ ControlList::paste (ControlList& alist, double pos, float times)
 
 /** Move automation around according to a list of region movements */
 void
-ControlList::move_ranges (RangeMoveList const & movements)
+ControlList::move_ranges (const list< RangeMove<double> >& movements)
 {
+       typedef list< RangeMove<double> > RangeMoveList;
+
        {
                Glib::Mutex::Lock lm (_lock);
 
@@ -1320,8 +1307,8 @@ ControlList::move_ranges (RangeMoveList const & movements)
                /* copy the events into the new list */
                for (RangeMoveList::const_iterator i = movements.begin (); i != movements.end (); ++i) {
                        iterator j = old_events.begin ();
-                       EventTime const limit = i->from + i->length;
-                       EventTime const dx = i->to - i->from;
+                       const double limit = i->from + i->length;
+                       const double dx    = i->to - i->from;
                        while (j != old_events.end () && (*j)->when <= limit) {
                                if ((*j)->when >= i->from) {
                                        ControlEvent* ev = new ControlEvent (**j);