diff options
| -rw-r--r-- | libs/evoral/src/ControlList.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libs/evoral/src/ControlList.cpp b/libs/evoral/src/ControlList.cpp index 8b8b86fb29..9079453f1c 100644 --- a/libs/evoral/src/ControlList.cpp +++ b/libs/evoral/src/ControlList.cpp @@ -1151,21 +1151,25 @@ ControlList::cut (iterator start, iterator end) return nal; } +/** @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); + /* find the first event in our list that is at or before `start' in time */ + ControlEvent cp (start, 0.0); 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); @@ -1174,9 +1178,7 @@ ControlList::cut_copy_clear (double start, double end, int op) } for (iterator x = s; x != e; ) { - iterator tmp; - - tmp = x; + iterator tmp = x; ++tmp; changed = true; |