smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 08:14:58 +01:00
Code Issues Projects Releases Wiki Activity

Speed up MIDI import (and non-cached cases of ControlList::eval) by a factor of roughly eleventy billion.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@3790 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2008-09-22 17:47:21 +00:00
parent 2d5163d099
commit 9aad7b5727
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libs/evoral/src/ControlList.cpp
View file

@ -636,6 +636,8 @@ ControlList::truncate_end (double last_coordinate)
beyond the new last coordinate. beyond the new last coordinate.
*/ */
// FIXME: SLOW! (size() == O(n))
uint32_t sz = _events.size(); uint32_t sz = _events.size();
while (i != _events.rend() && sz > 2) { while (i != _events.rend() && sz > 2) {
@ -775,7 +777,10 @@ ControlList::unlocked_eval (double x) const
double lval, uval; double lval, uval;
double fraction; 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) { switch (npoints) {
case 0: case 0:
@ -1022,9 +1027,10 @@ ControlList::rt_safe_earliest_event_linear_unlocked (double start, double end, d
{ {
//cerr << "earliest_event(" << start << ", " << end << ", " << x << ", " << y << ", " << inclusive << endl; //cerr << "earliest_event(" << start << ", " << end << ", " << x << ", " << y << ", " << inclusive << endl;
if (_events.size() == 0) const_iterator length_check_iter = _events.begin();
if (_events.empty()) // 0 events
return false; return false;
else if (_events.size() == 1) else if (_events.end() == ++length_check_iter) // 1 event
return rt_safe_earliest_event_discrete_unlocked(start, end, x, y, inclusive); return rt_safe_earliest_event_discrete_unlocked(start, end, x, y, inclusive);
// Hack to avoid infinitely repeating the same event // Hack to avoid infinitely repeating the same event