/* This file is part of Evoral.
- * Copyright (C) 2008 Dave Robillard <http://drobilla.net>
+ * Copyright (C) 2008 David Robillard <http://drobilla.net>
* Copyright (C) 2000-2008 Paul Davis
- *
+ *
* Evoral is free software; you can redistribute it and/or modify it under the
* terms of the GNU General Public License as published by the Free Software
* Foundation; either version 2 of the License, or (at your option) any later
* version.
- *
+ *
* Evoral is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for details.
- *
+ *
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <cassert>
#include <utility>
#include <iostream>
-#include <evoral/ControlList.hpp>
+#include "evoral/ControlList.hpp"
+#include "evoral/Curve.hpp"
using namespace std;
return a->when < b->when;
}
+/* this has no units but corresponds to the area of a rectangle
+ computed between three points in the list. If the area is
+ large, it indicates significant non-linearity between the
+ points.
+
+ during automation recording we thin the recorded points
+ using this value. if a point is sufficiently co-linear
+ with its neighbours (as defined by the area of the rectangle
+ formed by three of them), we will not include it in the
+ ControlList. a smaller value will exclude less points,
+ a larger value will exclude more points, so it effectively
+ measures the amount of thinning to be done.
+*/
-ControlList::ControlList (Parameter id)
+double ControlList::_thinning_factor = 20.0;
+
+ControlList::ControlList (const Parameter& id)
: _parameter(id)
, _interpolation(Linear)
- , _curve(new Curve(*this))
-{
+ , _curve(0)
+{
_frozen = 0;
_changed_when_thawed = false;
_min_yval = id.min();
_max_yval = id.max();
- _max_xval = 0; // means "no limit"
- _rt_insertion_point = _events.end();
+ _default_value = 0;
_lookup_cache.left = -1;
_lookup_cache.range.first = _events.end();
_search_cache.left = -1;
- _search_cache.range.first = _events.end();
+ _search_cache.first = _events.end();
_sort_pending = false;
}
ControlList::ControlList (const ControlList& other)
: _parameter(other._parameter)
, _interpolation(Linear)
- , _curve(new Curve(*this))
+ , _curve(0)
{
_frozen = 0;
_changed_when_thawed = false;
_min_yval = other._min_yval;
_max_yval = other._max_yval;
- _max_xval = other._max_xval;
_default_value = other._default_value;
- _rt_insertion_point = _events.end();
_lookup_cache.range.first = _events.end();
- _search_cache.range.first = _events.end();
+ _search_cache.first = _events.end();
_sort_pending = false;
for (const_iterator i = other._events.begin(); i != other._events.end(); ++i) {
ControlList::ControlList (const ControlList& other, double start, double end)
: _parameter(other._parameter)
, _interpolation(Linear)
- , _curve(new Curve(*this))
+ , _curve(0)
{
_frozen = 0;
_changed_when_thawed = false;
_min_yval = other._min_yval;
_max_yval = other._max_yval;
- _max_xval = other._max_xval;
_default_value = other._default_value;
- _rt_insertion_point = _events.end();
_lookup_cache.range.first = _events.end();
- _search_cache.range.first = _events.end();
+ _search_cache.first = _events.end();
_sort_pending = false;
/* now grab the relevant points, and shift them back if necessary */
for (EventList::iterator x = _events.begin(); x != _events.end(); ++x) {
delete (*x);
}
+
+ for (list<NascentInfo*>::iterator n = nascent.begin(); n != nascent.end(); ++n) {
+ for (EventList::iterator x = (*n)->events.begin(); x != (*n)->events.end(); ++x) {
+ delete *x;
+ }
+ delete (*n);
+ }
+
+ delete _curve;
}
-
boost::shared_ptr<ControlList>
ControlList::create(Parameter id)
return boost::shared_ptr<ControlList>(new ControlList(id));
}
-
bool
ControlList::operator== (const ControlList& other)
{
ControlList::operator= (const ControlList& other)
{
if (this != &other) {
-
+
_events.clear ();
-
+
for (const_iterator i = other._events.begin(); i != other._events.end(); ++i) {
_events.push_back (new ControlEvent (**i));
}
-
+
_min_yval = other._min_yval;
_max_yval = other._max_yval;
- _max_xval = other._max_xval;
_default_value = other._default_value;
-
+
mark_dirty ();
maybe_signal_changed ();
}
return *this;
}
+void
+ControlList::create_curve()
+{
+ _curve = new Curve(*this);
+}
+
+void
+ControlList::destroy_curve()
+{
+ delete _curve;
+ _curve = NULL;
+}
+
void
ControlList::maybe_signal_changed ()
{
mark_dirty ();
-
- if (_frozen)
+
+ if (_frozen) {
_changed_when_thawed = true;
+ }
}
void
return true;
}
-void ControlList::_x_scale (double factor)
+void
+ControlList::_x_scale (double factor)
{
for (iterator i = _events.begin(); i != _events.end(); ++i) {
- (*i)->when = floor ((*i)->when * factor);
+ (*i)->when *= factor;
}
mark_dirty ();
}
void
-ControlList::reposition_for_rt_add (double when)
+ControlList::write_pass_finished (double when)
{
- _rt_insertion_point = _events.end();
+ merge_nascent (when);
}
+
+struct ControlEventTimeComparator {
+ bool operator() (ControlEvent* a, ControlEvent* b) {
+ return a->when < b->when;
+ }
+};
+
void
-ControlList::rt_add (double when, double value)
+ControlList::merge_nascent (double when)
{
- // cerr << "RT: alist @ " << this << " add " << value << " @ " << when << endl;
-
{
Glib::Mutex::Lock lm (_lock);
- iterator where;
- ControlEvent cp (when, 0.0);
- bool done = false;
+ if (nascent.empty()) {
+ return;
+ }
- if ((_rt_insertion_point != _events.end()) && ((*_rt_insertion_point)->when < when) ) {
+ for (list<NascentInfo*>::iterator n = nascent.begin(); n != nascent.end(); ++n) {
- /* we have a previous insertion point, so we should delete
- everything between it and the position where we are going
- to insert this point.
- */
+ NascentInfo* ninfo = *n;
+ EventList& nascent_events (ninfo->events);
+ bool need_adjacent_start_clamp;
+ bool need_adjacent_end_clamp;
+
+ if (nascent_events.empty()) {
+ delete ninfo;
+ continue;
+ }
+
+ nascent_events.sort (ControlEventTimeComparator ());
+
+ if (ninfo->start_time < 0.0) {
+ ninfo->start_time = nascent_events.front()->when;
+ }
+
+ if (ninfo->end_time < 0.0) {
+ ninfo->end_time = when;
+ }
+
+ bool preexisting = !_events.empty();
+
+ if (!preexisting) {
+
+ _events = nascent_events;
+
+ } else if (ninfo->end_time < _events.front()->when) {
+
+ /* all points in nascent are before the first existing point */
+
+ _events.insert (_events.begin(), nascent_events.begin(), nascent_events.end());
+
+ } else if (ninfo->start_time > _events.back()->when) {
- iterator after = _rt_insertion_point;
+ /* all points in nascent are after the last existing point */
- if (++after != _events.end()) {
- iterator far = after;
+ _events.insert (_events.end(), nascent_events.begin(), nascent_events.end());
- while (far != _events.end()) {
- if ((*far)->when > when) {
- break;
+ } else {
+
+ /* find the range that overlaps with nascent events,
+ and insert the contents of nascent events.
+ */
+
+ iterator i;
+ iterator range_begin = _events.end();
+ iterator range_end = _events.end();
+ double end_value = unlocked_eval (ninfo->end_time);
+ double start_value = unlocked_eval (ninfo->start_time - 1);
+
+ need_adjacent_end_clamp = true;
+ need_adjacent_start_clamp = true;
+
+ for (i = _events.begin(); i != _events.end(); ++i) {
+
+ if ((*i)->when == ninfo->start_time) {
+ /* existing point at same time, remove it
+ and the consider the next point instead.
+ */
+ i = _events.erase (i);
+
+ if (i == _events.end()) {
+ break;
+ }
+
+ if (range_begin == _events.end()) {
+ range_begin = i;
+ need_adjacent_start_clamp = false;
+ } else {
+ need_adjacent_end_clamp = false;
+ }
+
+ if ((*i)->when > ninfo->end_time) {
+ range_end = i;
+ break;
+ }
+
+ } else if ((*i)->when > ninfo->start_time) {
+
+ if (range_begin == _events.end()) {
+ range_begin = i;
+ }
+
+ if ((*i)->when > ninfo->end_time) {
+ range_end = i;
+ break;
+ }
}
- ++far;
}
- if (_new_value) {
- where = far;
- _rt_insertion_point = where;
+ /* Now:
+ range_begin is the first event on our list after the first nascent event
+ range_end is the first event on our list after the last nascent event
- if ((*where)->when == when) {
- (*where)->value = value;
- done = true;
+ range_begin may be equal to _events.end() iff the last event on our list
+ was at the same time as the first nascent event.
+ */
+
+ if (range_begin != _events.begin()) {
+ /* clamp point before */
+ if (need_adjacent_start_clamp) {
+ _events.insert (range_begin, new ControlEvent (ninfo->start_time, start_value));
}
- } else {
- where = _events.erase (after, far);
}
- } else {
+ _events.insert (range_begin, nascent_events.begin(), nascent_events.end());
- where = after;
+ if (range_end != _events.end()) {
+ /* clamp point after */
+ if (need_adjacent_end_clamp) {
+ _events.insert (range_begin, new ControlEvent (ninfo->end_time, end_value));
+ }
+ }
+ _events.erase (range_begin, range_end);
}
+
+ delete ninfo;
+ }
+
+ nascent.clear ();
+
+ if (writing()) {
+ nascent.push_back (new NascentInfo ());
+ }
+ }
+
+ maybe_signal_changed ();
+}
+
+void
+ControlList::rt_add (double when, double value)
+{
+ // this is for automation recording
+
+ if (touch_enabled() && !touching()) {
+ return;
+ }
+
+ //cerr << "RT: alist " << this << " add " << value << " @ " << when << endl;
+
+ Glib::Mutex::Lock lm (_lock, Glib::TRY_LOCK);
+
+ if (lm.locked()) {
+ assert (!nascent.empty());
+ /* we don't worry about adding events out of time order as we will
+ sort them in merge_nascent.
+ */
+
+ EventList& el (nascent.back()->events);
+
+ if (el.size() > 1 && (when >= el.back()->when) && (value == el.back()->value)) {
+ /* same value, later timestamp, effective slope is
+ * zero, so just move the last point in nascent to our
+ * new time position. this avoids storing an unlimited
+ * number of points to represent a flat line.
+ */
+ el.back()->when = when;
+ } else {
+ nascent.back()->events.push_back (new ControlEvent (when, value));
+ }
+ }
+}
+
+void
+ControlList::thin ()
+{
+ Glib::Mutex::Lock lm (_lock);
+
+ ControlEvent* prevprev = 0;
+ ControlEvent* cur = 0;
+ ControlEvent* prev = 0;
+ iterator pprev;
+ int counter = 0;
+
+ for (iterator i = _events.begin(); i != _events.end(); ++i) {
+
+ cur = *i;
+ counter++;
+
+ if (counter > 2) {
- iterator previous = _rt_insertion_point;
- --previous;
-
- if (_rt_insertion_point != _events.begin() && (*_rt_insertion_point)->value == value && (*previous)->value == value) {
- (*_rt_insertion_point)->when = when;
- done = true;
-
- }
+ double area = fabs ((prevprev->when * (prev->value - cur->value)) +
+ (prev->when * (cur->value - prevprev->value)) +
+ (cur->when * (prevprev->value - prev->value)));
- } else {
+ if (area < _thinning_factor) {
+ iterator tmp = pprev;
+
+ /* pprev will change to current
+ i is incremented to the next event
+ */
- where = lower_bound (_events.begin(), _events.end(), &cp, time_comparator);
+ pprev = i;
+ _events.erase (tmp);
- if (where != _events.end()) {
- if ((*where)->when == when) {
- (*where)->value = value;
- done = true;
- }
+ continue;
}
}
- if (!done) {
- _rt_insertion_point = _events.insert (where, new ControlEvent (when, value));
- }
-
- _new_value = false;
- mark_dirty ();
+ prevprev = prev;
+ prev = cur;
+ pprev = i;
}
-
- maybe_signal_changed ();
}
void
/* to be used only for loading pre-sorted data from saved state */
_events.insert (_events.end(), new ControlEvent (when, value));
assert(_events.back());
+
+ mark_dirty ();
}
void
ControlList::add (double when, double value)
{
- /* this is for graphical editing */
+ /* this is for making changes from some kind of user interface or
+ control surface (GUI, MIDI, OSC etc)
+ */
+
+ if (!clamp_value (when, value)) {
+ return;
+ }
{
Glib::Mutex::Lock lm (_lock);
(*insertion_point)->value = value;
insert = false;
break;
- }
+ }
if ((*insertion_point)->when >= when) {
break;
}
if (insert) {
-
+
_events.insert (insertion_point, new ControlEvent (when, value));
- reposition_for_rt_add (0);
- }
+ }
mark_dirty ();
}
{
Glib::Mutex::Lock lm (_lock);
_events.erase (i);
- reposition_for_rt_add (0);
mark_dirty ();
}
maybe_signal_changed ();
{
Glib::Mutex::Lock lm (_lock);
_events.erase (start, end);
- reposition_for_rt_add (0);
mark_dirty ();
}
maybe_signal_changed ();
-}
+}
+
+/** Erase the first event which matches the given time and value */
+void
+ControlList::erase (double when, double value)
+{
+ {
+ Glib::Mutex::Lock lm (_lock);
+
+ iterator i = begin ();
+ while (i != end() && ((*i)->when != when || (*i)->value != value)) {
+ ++i;
+ }
+
+ if (i != end ()) {
+ _events.erase (i);
+ }
+
+ mark_dirty ();
+ }
+
+ maybe_signal_changed ();
+}
void
ControlList::reset_range (double start, double endt)
bool reset = false;
{
- Glib::Mutex::Lock lm (_lock);
+ Glib::Mutex::Lock lm (_lock);
ControlEvent cp (start, 0.0f);
iterator s;
iterator e;
-
+
if ((s = lower_bound (_events.begin(), _events.end(), &cp, time_comparator)) != _events.end()) {
cp.when = endt;
for (iterator i = s; i != e; ++i) {
(*i)->value = _default_value;
}
-
+
reset = true;
mark_dirty ();
{
Glib::Mutex::Lock lm (_lock);
- ControlEvent cp (start, 0.0f);
- iterator s;
- iterator e;
+ erased = erase_range_internal (start, endt, _events);
- if ((s = lower_bound (_events.begin(), _events.end(), &cp, time_comparator)) != _events.end()) {
- cp.when = endt;
- e = upper_bound (_events.begin(), _events.end(), &cp, time_comparator);
- _events.erase (s, e);
- reposition_for_rt_add (0);
- erased = true;
+ if (erased) {
mark_dirty ();
}
-
+
}
if (erased) {
}
}
-void
-ControlList::move_range (iterator start, iterator end, double xdelta, double ydelta)
+bool
+ControlList::erase_range_internal (double start, double endt, EventList & events)
{
- /* note: we assume higher level logic is in place to avoid this
- reordering the time-order of control events in the list. ie. all
- points after end are later than (end)->when.
- */
+ bool erased = false;
+ ControlEvent cp (start, 0.0f);
+ iterator s;
+ iterator e;
+
+ if ((s = lower_bound (events.begin(), events.end(), &cp, time_comparator)) != events.end()) {
+ cp.when = endt;
+ e = upper_bound (events.begin(), events.end(), &cp, time_comparator);
+ events.erase (s, e);
+ if (s != e) {
+ erased = true;
+ }
+ }
+
+ return erased;
+}
+void
+ControlList::slide (iterator before, double distance)
+{
{
Glib::Mutex::Lock lm (_lock);
- while (start != end) {
- (*start)->when += xdelta;
- (*start)->value += ydelta;
- if (isnan ((*start)->value)) {
- abort ();
- }
- ++start;
+ if (before == _events.end()) {
+ return;
}
- if (!_frozen) {
- _events.sort (event_time_less_than);
- } else {
- _sort_pending = true;
+ while (before != _events.end()) {
+ (*before)->when += distance;
+ ++before;
}
mark_dirty ();
}
void
-ControlList::slide (iterator before, double distance)
+ControlList::shift (double pos, double frames)
{
{
Glib::Mutex::Lock lm (_lock);
- if (before == _events.end()) {
- return;
- }
-
- while (before != _events.end()) {
- (*before)->when += distance;
- ++before;
+ for (iterator i = _events.begin(); i != _events.end(); ++i) {
+ if ((*i)->when >= pos) {
+ (*i)->when += frames;
+ }
}
+
+ mark_dirty ();
}
maybe_signal_changed ();
(*iter)->when = when;
(*iter)->value = val;
- if (isnan (val)) {
+ if (std::isnan (val)) {
abort ();
}
ret.second = _events.end();
for (i = lower_bound (_events.begin(), _events.end(), &cp, time_comparator); i != _events.end(); ++i) {
-
+
if (ret.first == _events.end()) {
if ((*i)->when >= xval) {
if (i != _events.begin()) {
return ret;
}
}
- }
-
+ }
+
if ((*i)->when > xval) {
ret.second = i;
break;
return ret;
}
-void
-ControlList::set_max_xval (double x)
-{
- _max_xval = x;
-}
-
void
ControlList::freeze ()
{
}
}
-void
+void
ControlList::mark_dirty () const
{
_lookup_cache.left = -1;
_search_cache.left = -1;
- if (_curve)
+
+ if (_curve) {
_curve->mark_dirty();
+ }
+
+ Dirty (); /* EMIT SIGNAL */
}
void
}
if (last_coordinate > _events.back()->when) {
-
+
/* extending end:
- */
+ */
iterator foo = _events.begin();
bool lessthantwo;
iterator penultimate = _events.end();
--penultimate; /* points at last point */
--penultimate; /* points at the penultimate point */
-
+
if (_events.back()->value == (*penultimate)->value) {
_events.back()->when = last_coordinate;
} else {
last_val = unlocked_eval (last_coordinate);
last_val = max ((double) _min_yval, last_val);
last_val = min ((double) _max_yval, last_val);
-
+
i = _events.rbegin();
-
+
/* make i point to the last control point */
-
+
++i;
-
+
/* now go backwards, removing control points that are
beyond the new last coordinate.
*/
+ // FIXME: SLOW! (size() == O(n))
+
uint32_t sz = _events.size();
-
+
while (i != _events.rend() && sz > 2) {
ControlList::reverse_iterator tmp;
-
+
tmp = i;
++tmp;
-
+
if ((*i)->when < last_coordinate) {
break;
}
-
+
_events.erase (i.base());
--sz;
i = tmp;
}
-
+
_events.back()->when = last_coordinate;
_events.back()->value = last_val;
}
- reposition_for_rt_add (0);
mark_dirty();
}
double first_legal_coordinate;
assert(!_events.empty());
-
+
if (overall_length == _events.back()->when) {
/* no change in overall length */
return;
}
-
+
if (overall_length > _events.back()->when) {
-
+
/* growing at front: duplicate first point. shift all others */
double shift = overall_length - _events.back()->when;
iterator second = _events.begin();
++second; /* points at the second point */
-
+
if (_events.front()->value == (*second)->value) {
/* first segment is flat, just move start point back to zero */
_events.front()->when = 0;
} else {
/* shrinking at front */
-
+
first_legal_coordinate = _events.back()->when - overall_length;
first_legal_value = unlocked_eval (first_legal_coordinate);
first_legal_value = max (_min_yval, first_legal_value);
/* remove all events earlier than the new "front" */
i = _events.begin();
-
+
while (i != _events.end() && !_events.empty()) {
ControlList::iterator tmp;
-
+
tmp = i;
++tmp;
-
+
if ((*i)->when > first_legal_coordinate) {
break;
}
-
+
_events.erase (i);
-
+
i = tmp;
}
-
+
/* shift all remaining points left to keep their same
relative position
*/
-
+
for (i = _events.begin(); i != _events.end(); ++i) {
(*i)->when -= first_legal_coordinate;
}
/* add a new point for the interpolated new value */
-
- _events.push_front (new ControlEvent (0, first_legal_value));
- }
- reposition_for_rt_add (0);
+ _events.push_front (new ControlEvent (0, first_legal_value));
+ }
mark_dirty();
}
double lval, uval;
double fraction;
- npoints = _events.size();
+ const_iterator length_check_iter = _events.begin();
+ 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 {
- // 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) {
- // return _default_value;
+ } else if (x <= _events.front()->when) {
return _events.front()->value;
}
lval = _events.front()->value;
upos = _events.back()->when;
uval = _events.back()->value;
-
- if (_interpolation == Discrete)
- return lval;
- /* linear interpolation betweeen the two points
- */
+ if (_interpolation == Discrete) {
+ return lval;
+ }
+ /* 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) {
- // 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
double upos, lpos;
double uval, lval;
double fraction;
-
+
/* "Stepped" lookup (no interpolation) */
/* FIXME: no cache. significant? */
if (_interpolation == Discrete) {
/* Only do the range lookup if x is in a different range than last time
* this was called (or if the lookup cache has been marked "dirty" (left<0) */
if ((_lookup_cache.left < 0) ||
- ((_lookup_cache.left > x) ||
- (_lookup_cache.range.first == _events.end()) ||
+ ((_lookup_cache.left > x) ||
+ (_lookup_cache.range.first == _events.end()) ||
((*_lookup_cache.range.second)->when < x))) {
const ControlEvent cp (x, 0);
-
+
_lookup_cache.range = equal_range (_events.begin(), _events.end(), &cp, time_comparator);
}
-
+
pair<const_iterator,const_iterator> range = _lookup_cache.range;
if (range.first == range.second) {
// return _default_value;
return _events.front()->value;
}
-
+
if (range.second == _events.end()) {
/* we're after the last point */
return _events.back()->value;
upos = (*range.second)->when;
uval = (*range.second)->value;
-
+
/* linear interpolation betweeen the two points
on either side of x
*/
fraction = (double) (x - lpos) / (double) (upos - lpos);
return lval + (fraction * (uval - lval));
- }
+ }
/* x is a control point in the data */
_lookup_cache.left = -1;
}
void
-ControlList::build_search_cache_if_necessary(double start, double end) const
+ControlList::build_search_cache_if_necessary (double start) const
{
/* Only do the range lookup if x is in a different range than last time
* this was called (or if the search cache has been marked "dirty" (left<0) */
- if (!_events.empty() && ((_search_cache.left < 0) ||
- ((_search_cache.left > start) ||
- (_search_cache.right < end)))) {
+ if (!_events.empty() && ((_search_cache.left < 0) || (_search_cache.left > start))) {
const ControlEvent start_point (start, 0);
- const ControlEvent end_point (end, 0);
//cerr << "REBUILD: (" << _search_cache.left << ".." << _search_cache.right << ") := ("
// << start << ".." << end << ")" << endl;
- _search_cache.range.first = lower_bound (_events.begin(), _events.end(), &start_point, time_comparator);
- _search_cache.range.second = upper_bound (_events.begin(), _events.end(), &end_point, time_comparator);
-
+ _search_cache.first = lower_bound (_events.begin(), _events.end(), &start_point, time_comparator);
_search_cache.left = start;
- _search_cache.right = end;
}
}
-/** Get the earliest event between \a start and \a end, using the current interpolation style.
+/** Get the earliest event after \a start using the current interpolation style.
*
* If an event is found, \a x and \a y are set to its coordinates.
*
* \return true if event is found (and \a x and \a y are valid).
*/
bool
-ControlList::rt_safe_earliest_event(double start, double end, double& x, double& y, bool inclusive) const
+ControlList::rt_safe_earliest_event (double start, double& x, double& y, bool inclusive) const
{
// FIXME: It would be nice if this was unnecessary..
Glib::Mutex::Lock lm(_lock, Glib::TRY_LOCK);
return false;
}
- return rt_safe_earliest_event_unlocked(start, end, x, y, inclusive);
-}
+ return rt_safe_earliest_event_unlocked (start, x, y, inclusive);
+}
-/** Get the earliest event between \a start and \a end, using the current interpolation style.
+/** Get the earliest event after \a start using the current interpolation style.
*
* If an event is found, \a x and \a y are set to its coordinates.
*
* \return true if event is found (and \a x and \a y are valid).
*/
bool
-ControlList::rt_safe_earliest_event_unlocked(double start, double end, double& x, double& y, bool inclusive) const
+ControlList::rt_safe_earliest_event_unlocked (double start, double& x, double& y, bool inclusive) const
{
- if (_interpolation == Discrete)
- return rt_safe_earliest_event_discrete_unlocked(start, end, x, y, inclusive);
- else
- return rt_safe_earliest_event_linear_unlocked(start, end, x, y, inclusive);
-}
+ if (_interpolation == Discrete) {
+ return rt_safe_earliest_event_discrete_unlocked(start, x, y, inclusive);
+ } else {
+ return rt_safe_earliest_event_linear_unlocked(start, x, y, inclusive);
+ }
+}
-/** Get the earliest event between \a start and \a end (Discrete (lack of) interpolation)
+/** Get the earliest event after \a start without interpolation.
*
* If an event is found, \a x and \a y are set to its coordinates.
*
* \return true if event is found (and \a x and \a y are valid).
*/
bool
-ControlList::rt_safe_earliest_event_discrete_unlocked (double start, double end, double& x, double& y, bool inclusive) const
+ControlList::rt_safe_earliest_event_discrete_unlocked (double start, double& x, double& y, bool inclusive) const
{
- build_search_cache_if_necessary(start, end);
-
- const pair<const_iterator,const_iterator>& range = _search_cache.range;
+ build_search_cache_if_necessary (start);
- if (range.first != _events.end()) {
- const ControlEvent* const first = *range.first;
+ if (_search_cache.first != _events.end()) {
+ const ControlEvent* const first = *_search_cache.first;
const bool past_start = (inclusive ? first->when >= start : first->when > start);
/* Earliest points is in range, return it */
- if (past_start >= start && first->when < end) {
+ if (past_start) {
x = first->when;
y = first->value;
/* Move left of cache to this point
* (Optimize for immediate call this cycle within range) */
_search_cache.left = x;
- ++_search_cache.range.first;
+ ++_search_cache.first;
assert(x >= start);
- assert(x < end);
return true;
} else {
return false;
}
-
- /* No points in range */
+
+ /* No points in range */
} else {
return false;
}
* \return true if event is found (and \a x and \a y are valid).
*/
bool
-ControlList::rt_safe_earliest_event_linear_unlocked (double start, double end, double& x, double& y, bool inclusive) const
+ControlList::rt_safe_earliest_event_linear_unlocked (double start, double& x, double& y, bool inclusive) const
{
- //cerr << "earliest_event(" << start << ", " << end << ", " << x << ", " << y << ", " << inclusive << endl;
+ // cout << "earliest_event(start: " << start << ", x: " << x << ", y: " << y << ", inclusive: " << inclusive << ")" << endl;
- if (_events.size() == 0)
+ const_iterator length_check_iter = _events.begin();
+ if (_events.empty()) { // 0 events
return false;
- else if (_events.size() == 1)
- return rt_safe_earliest_event_discrete_unlocked(start, end, x, y, inclusive);
+ } else if (_events.end() == ++length_check_iter) { // 1 event
+ return rt_safe_earliest_event_discrete_unlocked (start, x, y, inclusive);
+ }
// Hack to avoid infinitely repeating the same event
- build_search_cache_if_necessary(start, end);
-
- pair<const_iterator,const_iterator> range = _search_cache.range;
+ build_search_cache_if_necessary (start);
- if (range.first != _events.end()) {
+ if (_search_cache.first != _events.end()) {
const ControlEvent* first = NULL;
const ControlEvent* next = NULL;
/* Step is after first */
- if (range.first == _events.begin() || (*range.first)->when == start) {
- first = *range.first;
- next = *(++range.first);
- ++_search_cache.range.first;
+ if (_search_cache.first == _events.begin() || (*_search_cache.first)->when <= start) {
+ first = *_search_cache.first;
+ ++_search_cache.first;
+ if (_search_cache.first == _events.end()) {
+ return false;
+ }
+ next = *_search_cache.first;
- /* Step is before first */
+ /* Step is before first */
} else {
- const_iterator prev = range.first;
+ const_iterator prev = _search_cache.first;
--prev;
first = *prev;
- next = *range.first;
+ next = *_search_cache.first;
}
-
+
if (inclusive && first->when == start) {
x = first->when;
y = first->value;
* (Optimize for immediate call this cycle within range) */
_search_cache.left = x;
//++_search_cache.range.first;
+ assert(x >= start);
return true;
}
-
- if (abs(first->value - next->value) <= 1) {
- if (next->when <= end && (!inclusive || next->when > start)) {
+
+ if (fabs(first->value - next->value) <= 1) {
+ if (next->when > start) {
x = next->when;
y = next->value;
/* Move left of cache to this point
* (Optimize for immediate call this cycle within range) */
_search_cache.left = x;
//++_search_cache.range.first;
+ assert(inclusive ? x >= start : x > start);
return true;
} else {
return false;
y = floor(y);
x = first->when + (y - first->value) / (double)slope;
-
+
while ((inclusive && x < start) || (x <= start && y != next->value)) {
-
+
if (first->value < next->value) // ramping up
y += 1.0;
else // ramping down
}
/*cerr << first->value << " @ " << first->when << " ... "
- << next->value << " @ " << next->when
- << " = " << y << " @ " << x << endl;*/
+ << next->value << " @ " << next->when
+ << " = " << y << " @ " << x << endl;*/
assert( (y >= first->value && y <= next->value)
- || (y <= first->value && y >= next->value) );
+ || (y <= first->value && y >= next->value) );
+
-
const bool past_start = (inclusive ? x >= start : x > start);
- if (past_start && x < end) {
+ if (past_start) {
/* Move left of cache to this point
* (Optimize for immediate call this cycle within range) */
_search_cache.left = x;
-
+ assert(inclusive ? x >= start : x > start);
return true;
-
} else {
return false;
}
-
- /* No points in the future, so no steps (towards them) in the future */
+
+ /* No points in the future, so no steps (towards them) in the future */
} else {
return false;
}
}
-boost::shared_ptr<ControlList>
-ControlList::cut (iterator start, iterator end)
-{
- boost::shared_ptr<ControlList> nal = create (_parameter);
-
- {
- Glib::Mutex::Lock lm (_lock);
-
- for (iterator x = start; x != end; ) {
- iterator tmp;
-
- tmp = x;
- ++tmp;
-
- nal->_events.push_back (new ControlEvent (**x));
- _events.erase (x);
-
- reposition_for_rt_add (0);
-
- x = tmp;
- }
-
- mark_dirty ();
- }
-
- maybe_signal_changed ();
-
- return nal;
-}
+/** @param start Start position in model coordinates.
+ * @param end End position in model coordinates.
+ * @param op 0 = cut, 1 = copy, 2 = clear.
+ */
boost::shared_ptr<ControlList>
ControlList::cut_copy_clear (double start, double end, int op)
{
boost::shared_ptr<ControlList> nal = create (_parameter);
iterator s, e;
ControlEvent cp (start, 0.0);
- bool changed = false;
-
+
{
Glib::Mutex::Lock lm (_lock);
+ /* first, determine s & e, two iterators that define the range of points
+ affected by this operation
+ */
+
if ((s = lower_bound (_events.begin(), _events.end(), &cp, time_comparator)) == _events.end()) {
return nal;
}
+ /* and the last that is at or after `end' */
cp.when = end;
e = upper_bound (_events.begin(), _events.end(), &cp, time_comparator);
- if (op != 2 && (*s)->when != start) {
- nal->_events.push_back (new ControlEvent (0, unlocked_eval (start)));
+
+ /* if "start" isn't the location of an existing point,
+ evaluate the curve to get a value for the start. Add a point to
+ both the existing event list, and if its not a "clear" operation,
+ to the copy ("nal") as well.
+
+ Note that the time positions of the points in each list are different
+ because we want the copy ("nal") to have a zero time reference.
+ */
+
+
+ /* before we begin any cut/clear operations, get the value of the curve
+ at "end".
+ */
+
+ double end_value = unlocked_eval (end);
+
+ if ((*s)->when != start) {
+
+ double val = unlocked_eval (start);
+
+ if (op == 0) { // cut
+ if (start > _events.front()->when) {
+ _events.insert (s, (new ControlEvent (start, val)));
+ }
+ }
+
+ if (op != 2) { // ! clear
+ nal->_events.push_back (new ControlEvent (0, val));
+ }
}
for (iterator x = s; x != e; ) {
- iterator tmp;
-
- tmp = x;
- ++tmp;
- changed = true;
-
/* adjust new points to be relative to start, which
has been set to zero.
*/
-
+
if (op != 2) {
nal->_events.push_back (new ControlEvent ((*x)->when - start, (*x)->value));
}
if (op != 1) {
- _events.erase (x);
+ x = _events.erase (x);
+ } else {
+ ++x;
}
-
- x = tmp;
}
- if (op != 2 && nal->_events.back()->when != end - start) {
- nal->_events.push_back (new ControlEvent (end - start, unlocked_eval (end)));
- }
+ if (e == _events.end() || (*e)->when != end) {
+
+ /* only add a boundary point if there is a point after "end"
+ */
+
+ if (op == 0 && (e != _events.end() && end < (*e)->when)) { // cut
+ _events.insert (e, new ControlEvent (end, end_value));
+ }
- if (changed) {
- reposition_for_rt_add (0);
+ if (op != 2 && (e != _events.end() && end < (*e)->when)) { // cut/copy
+ nal->_events.push_back (new ControlEvent (end - start, end_value));
+ }
}
mark_dirty ();
}
- maybe_signal_changed ();
-
- return nal;
-
-}
-
-boost::shared_ptr<ControlList>
-ControlList::copy (iterator start, iterator end)
-{
- boost::shared_ptr<ControlList> nal = create (_parameter);
-
- {
- Glib::Mutex::Lock lm (_lock);
-
- for (iterator x = start; x != end; ) {
- iterator tmp;
-
- tmp = x;
- ++tmp;
-
- nal->_events.push_back (new ControlEvent (**x));
-
- x = tmp;
- }
+ if (op != 1) {
+ maybe_signal_changed ();
}
return nal;
}
+
boost::shared_ptr<ControlList>
ControlList::cut (double start, double end)
{
void
ControlList::clear (double start, double end)
{
- (void) cut_copy_clear (start, end, 2);
+ cut_copy_clear (start, end, 2);
}
+/** @param pos Position in model coordinates */
bool
-ControlList::paste (ControlList& alist, double pos, float times)
+ControlList::paste (ControlList& alist, double pos, float /*times*/)
{
if (alist._events.empty()) {
return false;
_events.insert (where, new ControlEvent( (*i)->when+pos,( *i)->value));
end = (*i)->when + pos;
}
-
-
- /* move all points after the insertion along the timeline by
+
+
+ /* move all points after the insertion along the timeline by
the correct amount.
*/
}
}
- reposition_for_rt_add (0);
mark_dirty ();
}
return true;
}
+/** Move automation around according to a list of region movements.
+ * @param return true if anything was changed, otherwise false (ie nothing needed changing)
+ */
+bool
+ControlList::move_ranges (const list< RangeMove<double> >& movements)
+{
+ typedef list< RangeMove<double> > RangeMoveList;
+
+ {
+ Glib::Mutex::Lock lm (_lock);
+
+ /* a copy of the events list before we started moving stuff around */
+ EventList old_events = _events;
+
+ /* clear the source and destination ranges in the new list */
+ bool things_erased = false;
+ for (RangeMoveList::const_iterator i = movements.begin (); i != movements.end (); ++i) {
+
+ if (erase_range_internal (i->from, i->from + i->length, _events)) {
+ things_erased = true;
+ }
+
+ if (erase_range_internal (i->to, i->to + i->length, _events)) {
+ things_erased = true;
+ }
+ }
+
+ /* if nothing was erased, there is nothing to do */
+ if (!things_erased) {
+ return false;
+ }
+
+ /* copy the events into the new list */
+ for (RangeMoveList::const_iterator i = movements.begin (); i != movements.end (); ++i) {
+ iterator j = old_events.begin ();
+ 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);
+ ev->when += dx;
+ _events.push_back (ev);
+ }
+ ++j;
+ }
+ }
+
+ if (!_frozen) {
+ _events.sort (event_time_less_than);
+ } else {
+ _sort_pending = true;
+ }
+
+ mark_dirty ();
+ }
+
+ maybe_signal_changed ();
+ return true;
+}
+
+void
+ControlList::set_interpolation (InterpolationStyle s)
+{
+ if (_interpolation == s) {
+ return;
+ }
+
+ _interpolation = s;
+ InterpolationChanged (s); /* EMIT SIGNAL */
+}
+
+void
+ControlList::set_thinning_factor (double v)
+{
+ _thinning_factor = v;
+}
+
} // namespace Evoral
projects / ardour.git / blobdiff