diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2012-09-09 20:21:50 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-09-09 20:21:50 +0000 |
commit | 999ec4a074027fb092b5f053ec0825f959f1a311 (patch) | |
tree | 2e9b0c5016ce42624d28d39968a756de411af0a8 /libs/evoral/src/ControlList.cpp | |
parent | bfb5292e74d17fb895dfe91d061b0f374cb49953 (diff) |
remove unused code
git-svn-id: svn://localhost/ardour2/branches/3.0@13181 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/evoral/src/ControlList.cpp')
-rw-r--r-- | libs/evoral/src/ControlList.cpp | 193 |
1 files changed, 0 insertions, 193 deletions
diff --git a/libs/evoral/src/ControlList.cpp b/libs/evoral/src/ControlList.cpp index c4495485de..907428af28 100644 --- a/libs/evoral/src/ControlList.cpp +++ b/libs/evoral/src/ControlList.cpp @@ -250,199 +250,6 @@ struct ControlEventTimeComparator { } }; -#if 0 - -void -ControlList::merge_nascent (double when) -{ - { - Glib::Threads::Mutex::Lock lm (_lock); - - if (nascent.empty()) { - return; - } - - bool was_empty = _events.empty(); - - 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 - */ - - _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)); - } - - /* add closing "clamp" point before we insert */ - - nascent_events.insert (nascent_events.end(), new ControlEvent (ninfo->end_time + 1, _default_value)); - - /* insert at front */ - - _events.insert (_events.begin(), nascent_events.begin(), nascent_events.end()); - - /* now add another default control point right - after the inserted nascent data - */ - - } else if (ninfo->start_time > _events.back()->when) { - - /* all points in nascent are after the last existing point */ - - if (ninfo->start_time > (_events.back()->when + 1)) { - 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 */ - - _events.insert (_events.end(), nascent_events.begin(), nascent_events.end()); - - } 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; - } - } - } - - /* 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 - - 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. - */ - - if (range_begin != _events.begin()) { - /* clamp point before */ - if (need_adjacent_start_clamp) { - _events.insert (range_begin, new ControlEvent (ninfo->start_time, start_value)); - } - } - - _events.insert (range_begin, nascent_events.begin(), nascent_events.end()); - - 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; - } - - if (was_empty && !_events.empty()) { - if (_events.front()->when != 0) { - _events.insert (_events.begin(), new ControlEvent (0, _default_value)); - } - } - - nascent.clear (); - - if (writing()) { - nascent.push_back (new NascentInfo ()); - } - } - - maybe_signal_changed (); -} -#endif - void ControlList::thin () { |