From 382a79eda52a206e090e4f374524042d1d45a694 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Thu, 22 Oct 2009 21:33:05 +0000
Subject: [PATCH] Remove linear search when adding/removing a note from/to a
 Sequence.

git-svn-id: svn://localhost/ardour2/branches/3.0@5870 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 libs/evoral/src/Sequence.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/libs/evoral/src/Sequence.cpp b/libs/evoral/src/Sequence.cpp
index 32191982c2..65e3fcc634 100644
--- a/libs/evoral/src/Sequence.cpp
+++ b/libs/evoral/src/Sequence.cpp
@@ -707,9 +707,7 @@ Sequence<Time>::add_note_unlocked(const boost::shared_ptr< Note<Time> > note)
 {
 	DUMP(format("%1% add note %2% @ %3%\n") % this % (int)note->note() % note->time());
 	_edited = true;
-	typename Notes::iterator i = upper_bound(_notes.begin(), _notes.end(), note,
-			note_time_comparator);
-	_notes.insert(i, note);
+	_notes.insert(note);
 }
 
 template<typename Time>
@@ -718,12 +716,13 @@ Sequence<Time>::remove_note_unlocked(const boost::shared_ptr< const Note<Time> >
 {
 	_edited = true;
 	DUMP(format("%1% remove note %2% @ %3%\n") % this % (int)note->note() % note->time());
-	for (typename Notes::iterator n = _notes.begin(); n != _notes.end(); ++n) {
-		if (*(*n) == *note) {
-			_notes.erase(n);
-			break;
+	for (typename Sequence<Time>::Notes::iterator i = note_lower_bound(note->time());
+			i != _notes.end() && (*i)->time() == note->time(); ++i) {
+		if (*i == note) {
+			_notes.erase(i);
 		}
 	}
+	cerr << "Unable to find note to erase" << endl;
 }
 
 template<typename Time>