#include "evoral/ControlList.hpp"
#include "evoral/Curve.hpp"
+#include "pbd/compose.h"
+
using namespace std;
+using namespace PBD;
namespace Evoral {
_search_cache.left = -1;
_search_cache.first = _events.end();
_sort_pending = false;
+ new_write_pass = true;
+ _in_write_pass = false;
+ did_write_during_pass = false;
+ insert_position = -1;
+ most_recent_insert_iterator = _events.end();
}
ControlList::ControlList (const ControlList& other)
_lookup_cache.range.first = _events.end();
_search_cache.first = _events.end();
_sort_pending = false;
+ new_write_pass = true;
+ _in_write_pass = false;
+ did_write_during_pass = false;
+ insert_position = -1;
+ most_recent_insert_iterator = _events.end();
copy_events (other);
copy_events (*(section.get()));
}
+ new_write_pass = false;
+ _in_write_pass = false;
+ did_write_during_pass = false;
+ insert_position = -1;
+ most_recent_insert_iterator = _events.end();
+
mark_dirty ();
}
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;
}
ControlList::copy_events (const ControlList& other)
{
{
- Glib::Mutex::Lock lm (_lock);
+ Glib::Threads::Mutex::Lock lm (_lock);
_events.clear ();
for (const_iterator i = other.begin(); i != other.end(); ++i) {
_events.push_back (new ControlEvent ((*i)->when, (*i)->value));
}
+ unlocked_invalidate_insert_iterator ();
mark_dirty ();
}
maybe_signal_changed ();
ControlList::clear ()
{
{
- Glib::Mutex::Lock lm (_lock);
+ Glib::Threads::Mutex::Lock lm (_lock);
_events.clear ();
+ unlocked_invalidate_insert_iterator ();
mark_dirty ();
}
void
ControlList::x_scale (double factor)
{
- Glib::Mutex::Lock lm (_lock);
+ Glib::Threads::Mutex::Lock lm (_lock);
_x_scale (factor);
}
bool
ControlList::extend_to (double when)
{
- Glib::Mutex::Lock lm (_lock);
+ Glib::Threads::Mutex::Lock lm (_lock);
if (_events.empty() || _events.back()->when == when) {
return false;
}
mark_dirty ();
}
-void
-ControlList::write_pass_finished (double when)
-{
- merge_nascent (when);
-}
-
-
struct ControlEventTimeComparator {
bool operator() (ControlEvent* a, ControlEvent* b) {
return a->when < b->when;
};
void
-ControlList::merge_nascent (double when)
+ControlList::thin ()
{
- {
- Glib::Mutex::Lock lm (_lock);
+ bool changed = false;
- if (nascent.empty()) {
- return;
- }
-
- bool was_empty = _events.empty();
+ {
+ Glib::Threads::Mutex::Lock lm (_lock);
+
+ ControlEvent* prevprev = 0;
+ ControlEvent* cur = 0;
+ ControlEvent* prev = 0;
+ iterator pprev;
+ int counter = 0;
+
+ DEBUG_TRACE (DEBUG::ControlList, string_compose ("@%1 thin from %2 events\n", this, _events.size()));
+
+ for (iterator i = _events.begin(); i != _events.end(); ++i) {
- for (list<NascentInfo*>::iterator n = nascent.begin(); n != nascent.end(); ++n) {
-
- NascentInfo* ninfo = *n;
- EventList& nascent_events (ninfo->events);
- bool need_adjacent_start_clamp;
- bool need_adjacent_end_clamp;
- EventList::iterator at;
-
- 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;
- }
-
- if (_events.empty()) {
-
- /* add an initial point just before
- the nascent data, unless nascent_events
- contains a point at zero or one
- */
-
- if (ninfo->start_time > 0) {
- nascent_events.insert (nascent_events.begin(), new ControlEvent (ninfo->start_time - 1, _default_value));
- }
-
- /* add closing "clamp" point before we insert */
-
- nascent_events.insert (nascent_events.end(), new ControlEvent (ninfo->end_time + 1, _default_value));
-
- /* insert - front or back doesn't matter since
- * _events is empty
+ cur = *i;
+ counter++;
+
+ if (counter > 2) {
+
+ /* compute the area of the triangle formed by 3 points
*/
-
- _events.insert (_events.begin(), nascent_events.begin(), nascent_events.end());
-
- } else if (ninfo->end_time < _events.front()->when) {
- /* all points in nascent are before the first existing point */
-
- if (ninfo->start_time > (_events.front()->when + 1)) {
- nascent_events.insert (nascent_events.begin(), new ControlEvent (ninfo->start_time - 1, _default_value));
+ double area = fabs ((prevprev->when * (prev->value - cur->value)) +
+ (prev->when * (cur->value - prevprev->value)) +
+ (cur->when * (prevprev->value - prev->value)));
+
+ if (area < _thinning_factor) {
+ iterator tmp = pprev;
+
+ /* pprev will change to current
+ i is incremented to the next event
+ as we loop.
+ */
+
+ pprev = i;
+ _events.erase (tmp);
+ changed = true;
+ continue;
}
+ }
+
+ prevprev = prev;
+ prev = cur;
+ pprev = i;
+ }
+
+ DEBUG_TRACE (DEBUG::ControlList, string_compose ("@%1 thin => %2 events\n", this, _events.size()));
- /* add closing "clamp" point before we insert */
-
- nascent_events.insert (nascent_events.end(), new ControlEvent (ninfo->end_time + 1, _default_value));
-
- /* insert at front */
+ if (changed) {
+ unlocked_invalidate_insert_iterator ();
+ mark_dirty ();
+ }
+ }
- _events.insert (_events.begin(), nascent_events.begin(), nascent_events.end());
-
- /* now add another default control point right
- after the inserted nascent data
- */
+ if (changed) {
+ maybe_signal_changed ();
+ }
+}
- } else if (ninfo->start_time > _events.back()->when) {
+void
+ControlList::fast_simple_add (double when, double value)
+{
+ Glib::Threads::Mutex::Lock lm (_lock);
+ /* to be used only for loading pre-sorted data from saved state */
+ _events.insert (_events.end(), new ControlEvent (when, value));
+ assert(_events.back());
- /* all points in nascent are after the last existing point */
+ mark_dirty ();
+}
- if (ninfo->start_time > (_events.back()->when + 1)) {
- nascent_events.insert (nascent_events.begin(), new ControlEvent (ninfo->start_time - 1, _default_value));
- }
+void
+ControlList::invalidate_insert_iterator ()
+{
+ Glib::Threads::Mutex::Lock lm (_lock);
+ unlocked_invalidate_insert_iterator ();
+}
- /* add closing "clamp" point before we insert */
+void
+ControlList::unlocked_invalidate_insert_iterator ()
+{
+ most_recent_insert_iterator = _events.end();
+}
- nascent_events.insert (nascent_events.end(), new ControlEvent (ninfo->end_time + 1, _default_value));
+void
+ControlList::start_write_pass (double when)
+{
+ Glib::Threads::Mutex::Lock lm (_lock);
- /* insert */
+ new_write_pass = true;
+ did_write_during_pass = false;
+ insert_position = when;
- _events.insert (_events.end(), nascent_events.begin(), nascent_events.end());
+ /* leave the insert iterator invalid, so that we will do the lookup
+ of where it should be in a "lazy" way - deferring it until
+ we actually add the first point (which may never happen).
+ */
- } else {
+ unlocked_invalidate_insert_iterator ();
+}
- /* find the range that overlaps with nascent events,
- and insert the contents of nascent events.
- */
+void
+ControlList::write_pass_finished (double when)
+{
+ if (did_write_during_pass) {
+ thin ();
+ did_write_during_pass = false;
+ }
+ new_write_pass = true;
+ _in_write_pass = false;
+}
- 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);
+void
+ControlList::set_in_write_pass (bool yn)
+{
+ _in_write_pass = yn;
+}
- need_adjacent_end_clamp = true;
- need_adjacent_start_clamp = true;
+bool
+ControlList::in_write_pass () const
+{
+ return _in_write_pass;
+}
- for (i = _events.begin(); i != _events.end(); ++i) {
+void
+ControlList::add (double when, double value)
+{
+ /* this is for making changes from some kind of user interface or
+ control surface (GUI, MIDI, OSC etc)
+ */
- 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 (!clamp_value (when, value)) {
+ return;
+ }
- if (i == _events.end()) {
- break;
- }
+ DEBUG_TRACE (DEBUG::ControlList, string_compose ("@%1 add %2 at %3 w/erase = %4 at end ? %5\n",
+ this, value, when, _in_write_pass, (most_recent_insert_iterator == _events.end())));
- if (range_begin == _events.end()) {
- range_begin = i;
- need_adjacent_start_clamp = false;
- } else {
- need_adjacent_end_clamp = false;
- }
+ {
+ Glib::Threads::Mutex::Lock lm (_lock);
+ ControlEvent cp (when, 0.0f);
+ iterator insertion_point;
- if ((*i)->when > ninfo->end_time) {
- range_end = i;
- break;
- }
+ if (_events.empty()) {
+
+ /* as long as the point we're adding is not at zero,
+ * add an "anchor" point there.
+ */
- } else if ((*i)->when > ninfo->start_time) {
+ if (when > 1) {
+ _events.insert (_events.end(), new ControlEvent (0, _default_value));
+ DEBUG_TRACE (DEBUG::ControlList, string_compose ("@%1 added default value %2 at zero\n", this, _default_value));
+ }
+ }
- if (range_begin == _events.end()) {
- range_begin = i;
- }
+ if (_in_write_pass && new_write_pass) {
- if ((*i)->when > ninfo->end_time) {
- range_end = i;
- break;
- }
- }
- }
+ DEBUG_TRACE (DEBUG::ControlList, string_compose ("@%1 new write pass, insert pos = %2\n", this, insert_position));
+
+ /* The first addition of a new control event during a
+ * write pass.
+ *
+ * We need to add a new point at insert_position
+ * corresponding the value there.
+ */
- /* 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
+ /* the insert_iterator is not set, figure out where
+ * it needs to be.
+ */
+
+ ControlEvent cp (insert_position, 0.0);
+ most_recent_insert_iterator = lower_bound (_events.begin(), _events.end(), &cp, time_comparator);
+ DEBUG_TRACE (DEBUG::ControlList, string_compose ("@%1 looked up insert iterator for new write pass\n", this));
- range_begin may be equal to _events.end() if the last event on our list
- was at the same time as the first nascent event.
- */
+ double eval_value = unlocked_eval (insert_position);
+
+ if (most_recent_insert_iterator == _events.end()) {
- if (range_begin != _events.begin()) {
- /* clamp point before */
- if (need_adjacent_start_clamp) {
- _events.insert (range_begin, new ControlEvent (ninfo->start_time, start_value));
- }
- }
+ DEBUG_TRACE (DEBUG::ControlList, string_compose ("@%1 insert iterator at end, adding eval-value there %2\n", this, eval_value));
+ _events.push_back (new ControlEvent (insert_position, eval_value));
+ /* leave insert iterator at the end */
- _events.insert (range_begin, nascent_events.begin(), nascent_events.end());
+ } else if ((*most_recent_insert_iterator)->when == when) {
- if (range_end != _events.end()) {
- /* clamp point after */
- if (need_adjacent_end_clamp) {
- _events.insert (range_begin, new ControlEvent (ninfo->end_time, end_value));
- }
- }
+ DEBUG_TRACE (DEBUG::ControlList, string_compose ("@%1 insert iterator at existing point, setting eval-value there %2\n", this, eval_value));
- _events.erase (range_begin, range_end);
- }
+ /* most_recent_insert_iterator points to a control event
+ already at the insert position, so there is
+ nothing to do.
- delete ninfo;
- }
+ ... except ...
- if (was_empty && !_events.empty()) {
- if (_events.front()->when != 0) {
- _events.insert (_events.begin(), new ControlEvent (0, _default_value));
- }
- }
+ advance most_recent_insert_iterator so that the "real"
+ insert occurs in the right place, since it
+ points to the control event just inserted.
+ */
- nascent.clear ();
+ ++most_recent_insert_iterator;
+ } else {
- if (writing()) {
- nascent.push_back (new NascentInfo ());
- }
- }
+ /* insert a new control event at the right spot
+ */
- maybe_signal_changed ();
-}
+ DEBUG_TRACE (DEBUG::ControlList, string_compose ("@%1 insert eval-value %2 just before iterator @ %3\n",
+ this, eval_value, (*most_recent_insert_iterator)->when));
-void
-ControlList::rt_add (double when, double value)
-{
- // this is for automation recording
+ most_recent_insert_iterator = _events.insert (most_recent_insert_iterator, new ControlEvent (insert_position, eval_value));
- if (touch_enabled() && !touching()) {
- return;
- }
-
- // cerr << "RT: alist " << this << " add " << value << " @ " << when << endl;
-
- Glib::Mutex::Lock lm (_lock, Glib::TRY_LOCK);
+ /* advance most_recent_insert_iterator so that the "real"
+ * insert occurs in the right place, since it
+ * points to the control event just inserted.
+ */
- 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.
- */
+ ++most_recent_insert_iterator;
+ }
- NascentInfo* ni (nascent.back());
- EventList& el (ni->events);
+ /* don't do this again till the next write pass */
+
+ new_write_pass = false;
+ did_write_during_pass = true;
- if (!el.empty() && (when >= el.back()->when) && (value == el.back()->value)) {
+ } else if (most_recent_insert_iterator == _events.end() || when > (*most_recent_insert_iterator)->when) {
- /* 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.
+ /* this is NOT the first point to be added after the
+ start of a write pass, and we have a bit of work to
+ do figuring out where to add the new point, as well
+ as potentially erasing existing data between the
+ most recently added point and wherever this one
+ will end up.
+ */
+
+ DEBUG_TRACE (DEBUG::ControlList, string_compose ("@%1 need to discover insert iterator (@end ? %2)\n",
+ this, (most_recent_insert_iterator == _events.end())));
+
+ /* this means that we either *know* we want to insert
+ * at the end, or that we don't know where to insert.
+ *
+ * so ... lets perform some quick checks before we
+ * go doing binary search to figure out where to
+ * insert.
*/
- ni->same_value_cnt++;
+ if (_events.back()->when == when) {
- if (ni->same_value_cnt > 1) {
- el.back()->when = when;
- return;
- }
- } else {
- ni->same_value_cnt = 0;
- }
+ /* we need to modify the final point, so
+ make most_recent_insert_iterator point to it.
+ */
- el.push_back (new ControlEvent (when, value));
- }
-}
+ DEBUG_TRACE (DEBUG::ControlList, string_compose ("@%1 modify final value\n", this));
+
+ most_recent_insert_iterator = _events.end();
+ --most_recent_insert_iterator;
-void
-ControlList::thin ()
-{
- Glib::Mutex::Lock lm (_lock);
+ } else if (_events.back()->when < when) {
- ControlEvent* prevprev = 0;
- ControlEvent* cur = 0;
- ControlEvent* prev = 0;
- iterator pprev;
- int counter = 0;
+ /* the new point is beyond the end of the
+ * current list
+ */
- for (iterator i = _events.begin(); i != _events.end(); ++i) {
+ DEBUG_TRACE (DEBUG::ControlList, string_compose ("@%1 plan to append to list\n", this));
- cur = *i;
- counter++;
+ if (_in_write_pass) {
+ /* remove the final point, because
+ we're adding one beyond it.
+ */
+ delete _events.back();
+ _events.pop_back();
+ }
+
+ /* leaving this here will force an append */
- if (counter > 2) {
-
- double area = fabs ((prevprev->when * (prev->value - cur->value)) +
- (prev->when * (cur->value - prevprev->value)) +
- (cur->when * (prevprev->value - prev->value)));
-
- if (area < _thinning_factor) {
- iterator tmp = pprev;
+ most_recent_insert_iterator = _events.end();
- /* pprev will change to current
- i is incremented to the next event
- */
+ } else {
- pprev = i;
- _events.erase (tmp);
+ DEBUG_TRACE (DEBUG::ControlList, string_compose ("@%1 erase %2 from existing iterator (@end ? %3\n",
+ this, _in_write_pass,
+ (most_recent_insert_iterator == _events.end())));
+
+ if (_in_write_pass) {
+ while (most_recent_insert_iterator != _events.end()) {
+ if ((*most_recent_insert_iterator)->when < when) {
+ if (_in_write_pass) {
+ DEBUG_TRACE (DEBUG::ControlList, string_compose ("@%1 erase existing @ %2\n", this, (*most_recent_insert_iterator)));
+ delete *most_recent_insert_iterator;
+ most_recent_insert_iterator = _events.erase (most_recent_insert_iterator);
+ continue;
+ }
+ } else if ((*most_recent_insert_iterator)->when >= when) {
+ break;
+ }
+ ++most_recent_insert_iterator;
+ }
+ } else {
+
+ /* not in a write pass: figure out the iterator we should insert in front of */
- continue;
+ ControlEvent cp (when, 0.0f);
+ most_recent_insert_iterator = lower_bound (_events.begin(), _events.end(), &cp, time_comparator);
+ }
}
- }
+ }
+
+ /* OK, now we're really ready to add a new point
+ */
- prevprev = prev;
- prev = cur;
- pprev = i;
- }
-}
+ if (most_recent_insert_iterator == _events.end()) {
+ DEBUG_TRACE (DEBUG::ControlList, string_compose ("@%1 appending new point at end\n", this));
+
+ bool done = false;
-void
-ControlList::fast_simple_add (double when, double value)
-{
- /* to be used only for loading pre-sorted data from saved state */
- _events.insert (_events.end(), new ControlEvent (when, value));
- assert(_events.back());
+ /* check if would just be adding to a straight line,
+ * and don't add another point if so
+ */
- mark_dirty ();
-}
+ if (!_events.empty()) { // avoid O(N) _events.size() here
+ if (_events.back()->value == value) {
+ EventList::iterator b = _events.end();
+ --b; // final point, which we know exists
+ if (b != _events.begin()) { // step back again, but check first that it is legal
+ --b; // penultimate-point
+ if ((*b)->value == value) {
+ /* there are at least two points with the exact same value ...
+ * straight line - just move the final
+ * point to the new time
+ */
+ _events.back()->when = when;
+ done = true;
+ }
+ }
+ }
+ }
-void
-ControlList::add (double when, double value)
-{
- /* this is for making changes from some kind of user interface or
- control surface (GUI, MIDI, OSC etc)
- */
+ if (!done) {
+ _events.push_back (new ControlEvent (when, value));
+ }
- if (!clamp_value (when, value)) {
- return;
- }
+ if (!_in_write_pass) {
+ most_recent_insert_iterator = _events.end();
+ --most_recent_insert_iterator;
+ }
- {
- Glib::Mutex::Lock lm (_lock);
- ControlEvent cp (when, 0.0f);
- bool insert = true;
- iterator insertion_point;
+ } else if ((*most_recent_insert_iterator)->when == when) {
+ DEBUG_TRACE (DEBUG::ControlList, string_compose ("@%1 reset existing point to new value %2\n", this, value));
- if (_events.empty()) {
- if (when > 1) {
- _events.insert (_events.end(), new ControlEvent (0, _default_value));
- }
- }
+ /* only one point allowed per time point, so just
+ * reset the value here.
+ */
- for (insertion_point = lower_bound (_events.begin(), _events.end(), &cp, time_comparator); insertion_point != _events.end(); ++insertion_point) {
+ (*most_recent_insert_iterator)->value = value;
- /* only one point allowed per time point */
+ } else {
+ DEBUG_TRACE (DEBUG::ControlList, string_compose ("@%1 insert new point at %2 at iterator at %3\n", this, when, (*most_recent_insert_iterator)->when));
+
+ bool done = false;
+
+ /* check if would just be adding to a straight line,
+ * and don't add another point if so
+ */
- if ((*insertion_point)->when == when) {
- (*insertion_point)->value = value;
- insert = false;
- break;
+ if (most_recent_insert_iterator != _events.begin()) {
+ EventList::iterator b = most_recent_insert_iterator;
+ --b; // prior point, which we know exists
+ if ((*b)->value == value) { // same value as the point we plan to insert
+ if (b != _events.begin()) { // step back again, which may not be possible
+ EventList::iterator bb = b;
+ --bb; // next-to-prior-point
+ if ((*bb)->value == value) {
+ /* straight line - just move the prior
+ * point to the new time
+ */
+ (*b)->when = when;
+
+ if (!_in_write_pass) {
+ most_recent_insert_iterator = b;
+ }
+
+ done = true;
+ }
+ }
+ }
}
+
+ if (!done) {
+ EventList::iterator x = _events.insert (most_recent_insert_iterator, new ControlEvent (when, value));
- if ((*insertion_point)->when >= when) {
- break;
+ if (!_in_write_pass) {
+ most_recent_insert_iterator = x;
+ }
}
}
- if (insert) {
- _events.insert (insertion_point, new ControlEvent (when, value));
- }
-
mark_dirty ();
}
ControlList::erase (iterator i)
{
{
- Glib::Mutex::Lock lm (_lock);
+ Glib::Threads::Mutex::Lock lm (_lock);
+ if (most_recent_insert_iterator == i) {
+ unlocked_invalidate_insert_iterator ();
+ }
_events.erase (i);
mark_dirty ();
}
ControlList::erase (iterator start, iterator end)
{
{
- Glib::Mutex::Lock lm (_lock);
+ Glib::Threads::Mutex::Lock lm (_lock);
_events.erase (start, end);
+ unlocked_invalidate_insert_iterator ();
mark_dirty ();
}
maybe_signal_changed ();
ControlList::erase (double when, double value)
{
{
- Glib::Mutex::Lock lm (_lock);
+ Glib::Threads::Mutex::Lock lm (_lock);
iterator i = begin ();
while (i != end() && ((*i)->when != when || (*i)->value != value)) {
if (i != end ()) {
_events.erase (i);
+ if (most_recent_insert_iterator == i) {
+ unlocked_invalidate_insert_iterator ();
+ }
}
mark_dirty ();
bool erased = false;
{
- Glib::Mutex::Lock lm (_lock);
+ Glib::Threads::Mutex::Lock lm (_lock);
erased = erase_range_internal (start, endt, _events);
if (erased) {
e = upper_bound (events.begin(), events.end(), &cp, time_comparator);
events.erase (s, e);
if (s != e) {
+ unlocked_invalidate_insert_iterator ();
erased = true;
}
}
ControlList::slide (iterator before, double distance)
{
{
- Glib::Mutex::Lock lm (_lock);
+ Glib::Threads::Mutex::Lock lm (_lock);
if (before == _events.end()) {
return;
ControlList::shift (double pos, double frames)
{
{
- Glib::Mutex::Lock lm (_lock);
+ Glib::Threads::Mutex::Lock lm (_lock);
for (iterator i = _events.begin(); i != _events.end(); ++i) {
if ((*i)->when >= pos) {
*/
{
- Glib::Mutex::Lock lm (_lock);
+ Glib::Threads::Mutex::Lock lm (_lock);
(*iter)->when = when;
(*iter)->value = val;
if (!_frozen) {
_events.sort (event_time_less_than);
+ unlocked_invalidate_insert_iterator ();
} else {
_sort_pending = true;
}
std::pair<ControlList::iterator,ControlList::iterator>
ControlList::control_points_adjacent (double xval)
{
- Glib::Mutex::Lock lm (_lock);
+ Glib::Threads::Mutex::Lock lm (_lock);
iterator i;
ControlEvent cp (xval, 0.0f);
std::pair<iterator,iterator> ret;
}
{
- Glib::Mutex::Lock lm (_lock);
+ Glib::Threads::Mutex::Lock lm (_lock);
if (_sort_pending) {
_events.sort (event_time_less_than);
+ unlocked_invalidate_insert_iterator ();
_sort_pending = false;
}
}
ControlList::truncate_end (double last_coordinate)
{
{
- Glib::Mutex::Lock lm (_lock);
+ Glib::Threads::Mutex::Lock lm (_lock);
ControlEvent cp (last_coordinate, 0);
ControlList::reverse_iterator i;
double last_val;
_events.back()->when = last_coordinate;
_events.back()->value = last_val;
}
-
+
+ unlocked_invalidate_insert_iterator ();
mark_dirty();
}
ControlList::truncate_start (double overall_length)
{
{
- Glib::Mutex::Lock lm (_lock);
+ Glib::Threads::Mutex::Lock lm (_lock);
iterator i;
double first_legal_value;
double first_legal_coordinate;
_events.push_front (new ControlEvent (0, first_legal_value));
}
+ unlocked_invalidate_insert_iterator ();
mark_dirty();
}
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);
+ Glib::Threads::Mutex::Lock lm(_lock, Glib::Threads::TRY_LOCK);
if (!lm.locked()) {
return false;
}
ControlEvent cp (start, 0.0);
{
- Glib::Mutex::Lock lm (_lock);
+ Glib::Threads::Mutex::Lock lm (_lock);
/* first, determine s & e, two iterators that define the range of points
affected by this operation
}
}
+ unlocked_invalidate_insert_iterator ();
mark_dirty ();
}
}
{
- Glib::Mutex::Lock lm (_lock);
+ Glib::Threads::Mutex::Lock lm (_lock);
iterator where;
iterator prev;
double end = 0;
}
}
+ unlocked_invalidate_insert_iterator ();
mark_dirty ();
}
typedef list< RangeMove<double> > RangeMoveList;
{
- Glib::Mutex::Lock lm (_lock);
+ Glib::Threads::Mutex::Lock lm (_lock);
/* a copy of the events list before we started moving stuff around */
EventList old_events = _events;
if (!_frozen) {
_events.sort (event_time_less_than);
+ unlocked_invalidate_insert_iterator ();
} else {
_sort_pending = true;
}
projects / ardour.git / blobdiff