From: David Robillard <d@drobilla.net>
Date: Wed, 21 Oct 2009 16:39:39 +0000 (+0000)
Subject: Fix O(n) search on MIDI rec region update (now O(log(n)) per update, but could be... 
X-Git-Tag: 3.0-alpha5~2951
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=86a09c58e3e0e66b1e3525680327545f2b5372c6;p=ardour.git

Fix O(n) search on MIDI rec region update (now O(log(n)) per update, but could be O(1) with caching...)


git-svn-id: svn://localhost/ardour2/branches/3.0@5843 d708f5d6-7413-0410-9779-e7cbd77b26cf
---

diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc
index 537c4cb725..9d87738354 100644
--- a/gtk2_ardour/midi_streamview.cc
+++ b/gtk2_ardour/midi_streamview.cc
@@ -575,12 +575,12 @@ MidiStreamView::update_rec_regions (boost::shared_ptr<MidiModel> data, nframes_t
 						rect->property_x2() = xend;
 
 						ARDOUR::BeatsFramesConverter tconv(_trackview.session(), region->position());
+						const MidiModel::TimeType start_beats = tconv.from(start);
 
 						/* draw events */
 						MidiRegionView* mrv = (MidiRegionView*)iter->second;
 
-						// FIXME: this is offensively slow (linear search)
-						for (MidiModel::Notes::const_iterator i = data->notes().begin();
+						for (MidiModel::Notes::const_iterator i = data->note_lower_bound(start_beats);
 								i != data->notes().end(); ++i) {
 
 							const boost::shared_ptr<MidiRegionView::NoteType>& note = *i;
diff --git a/libs/evoral/evoral/Sequence.hpp b/libs/evoral/evoral/Sequence.hpp
index 22d81b6948..b5737638e1 100644
--- a/libs/evoral/evoral/Sequence.hpp
+++ b/libs/evoral/evoral/Sequence.hpp
@@ -179,6 +179,8 @@ public:
 	const_iterator        begin(Time t=0) const { return const_iterator(*this, t); }
 	const const_iterator& end()           const { return _end_iter; }
 
+	typename Notes::const_iterator note_lower_bound (Time t) const;
+
 	bool control_to_midi_event(boost::shared_ptr< Event<Time> >& ev,
 	                           const ControlIterator&            iter) const;
 
diff --git a/libs/evoral/src/Sequence.cpp b/libs/evoral/src/Sequence.cpp
index e27668e626..b4b2d4d2fa 100644
--- a/libs/evoral/src/Sequence.cpp
+++ b/libs/evoral/src/Sequence.cpp
@@ -99,12 +99,10 @@ Sequence<Time>::const_iterator::const_iterator(const Sequence<Time>& seq, Time t
 
 	seq.read_lock();
 
-	// Find first note which begins after t
-	boost::shared_ptr< Note<Time> > search_note(new Note<Time>(0, t, 0, 0, 0));
-	_note_iter = seq.notes().lower_bound(search_note);
-	assert(_note_iter == seq.notes().end() || (*_note_iter)->time() >= t);
+	// Find first note which begins at or after t
+	_note_iter = seq.note_lower_bound(t);
 
-	// Find first sysex event after t
+	// Find first sysex event at or after t
 	for (typename Sequence<Time>::SysExes::const_iterator i = seq.sysexes().begin();
 			i != seq.sysexes().end(); ++i) {
 		if ((*i)->time() >= t) {
@@ -776,6 +774,17 @@ Sequence<Time>::set_notes (const Sequence<Time>::Notes& n)
 	_notes = n;
 }
 
+/** Return the earliest note with time >= t */
+template<typename Time>
+typename Sequence<Time>::Notes::const_iterator
+Sequence<Time>::note_lower_bound (Time t) const
+{
+	boost::shared_ptr< Note<Time> > search_note(new Note<Time>(0, t, 0, 0, 0));
+	typename Sequence<Time>::Notes::const_iterator i = _notes.lower_bound(search_note);
+	assert(i == _notes.end() || (*i)->time() >= t);
+	return i;
+}
+
 template class Sequence<Evoral::MusicalTime>;
 
 } // namespace Evoral