diff options
author | Carl Hetherington <carl@carlh.net> | 2012-04-22 14:03:07 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2012-04-22 14:03:07 +0000 |
commit | a4434809e147d7f091fd488d047c531ff4c344c9 (patch) | |
tree | 2ffc14ef55a0ca310b4f772bcb87d662084a752c /libs | |
parent | 82c867bf2a6f4de102707b812a87d68e3bd6e170 (diff) |
Use a list of ControlPoints to hold the automation selection,
rather than a time range. This makes more sense now that we
display every point on an automation line, rather than just
a subset. Makes the code a fair bit simpler, and should fix
some unexpected behaviours, especially when cutting automation
points.
git-svn-id: svn://localhost/ardour2/branches/3.0@12054 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
-rw-r--r-- | libs/evoral/evoral/ControlList.hpp | 1 | ||||
-rw-r--r-- | libs/evoral/src/ControlList.cpp | 31 |
2 files changed, 0 insertions, 32 deletions
diff --git a/libs/evoral/evoral/ControlList.hpp b/libs/evoral/evoral/ControlList.hpp index 324d03cc28..30b9fca430 100644 --- a/libs/evoral/evoral/ControlList.hpp +++ b/libs/evoral/evoral/ControlList.hpp @@ -123,7 +123,6 @@ public: void fast_simple_add (double when, double value); void merge_nascent (double when); - void reset_range (double start, double end); void erase_range (double start, double end); void erase (iterator); void erase (iterator, iterator); diff --git a/libs/evoral/src/ControlList.cpp b/libs/evoral/src/ControlList.cpp index e90b28c147..9c38f67b29 100644 --- a/libs/evoral/src/ControlList.cpp +++ b/libs/evoral/src/ControlList.cpp @@ -558,37 +558,6 @@ ControlList::erase (double when, double value) } void -ControlList::reset_range (double start, double endt) -{ - bool reset = false; - - { - 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; - e = upper_bound (_events.begin(), _events.end(), &cp, time_comparator); - - for (iterator i = s; i != e; ++i) { - (*i)->value = _default_value; - } - - reset = true; - - mark_dirty (); - } - } - - if (reset) { - maybe_signal_changed (); - } -} - -void ControlList::erase_range (double start, double endt) { bool erased = false; |