X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fevoral%2Fsrc%2FSequence.cpp;h=a77e3c94be5c3d76ffefdd35244b176df9d92fc6;hb=97d344f740925de178655b850f68d44041cce046;hp=7a8a08cfdfd26994d94064b9e200ba158136fa56;hpb=f97da74cf7d3c2d3ae580473fa4639b0b259bf5b;p=ardour.git

diff --git a/libs/evoral/src/Sequence.cpp b/libs/evoral/src/Sequence.cpp
index 7a8a08cfdf..a77e3c94be 100644
--- a/libs/evoral/src/Sequence.cpp
+++ b/libs/evoral/src/Sequence.cpp
@@ -24,6 +24,10 @@
 #include <stdint.h>
 #include <cstdio>
 
+#if __clang__
+#include "evoral/Note.hpp"
+#endif
+
 #include "pbd/compose.h"
 #include "pbd/error.h"
 
@@ -31,7 +35,7 @@
 #include "evoral/ControlList.hpp"
 #include "evoral/ControlSet.hpp"
 #include "evoral/EventSink.hpp"
-#include "evoral/MIDIParameters.hpp"
+#include "evoral/ParameterDescriptor.hpp"
 #include "evoral/Sequence.hpp"
 #include "evoral/TypeMap.hpp"
 #include "evoral/midi_util.h"
@@ -57,10 +61,13 @@ namespace Evoral {
 template<typename Time>
 Sequence<Time>::const_iterator::const_iterator()
 	: _seq(NULL)
+	, _event(boost::shared_ptr< Event<Time> >(new Event<Time>()))
+	, _active_patch_change_message (0)
+	, _type(NIL)
 	, _is_end(true)
 	, _control_iter(_control_iters.end())
+	, _force_discrete(false)
 {
-	_event = boost::shared_ptr< Event<Time> >(new Event<Time>());
 }
 
 /** @param force_discrete true to force ControlLists to use discrete evaluation, otherwise false to get them to use their configured mode */
@@ -107,10 +114,10 @@ Sequence<Time>::const_iterator::const_iterator(const Sequence<Time>& seq, Time t
 	assert (_patch_change_iter == seq.patch_changes().end() || (*_patch_change_iter)->time() >= t);
 
 	// Find first control event after t
-	ControlIterator earliest_control(boost::shared_ptr<ControlList>(), DBL_MAX, 0.0);
 	_control_iters.reserve(seq._controls.size());
 	bool   found                  = false;
 	size_t earliest_control_index = 0;
+	double earliest_control_x     = DBL_MAX;
 	for (Controls::const_iterator i = seq._controls.begin(); i != seq._controls.end(); ++i) {
 
 		if (filtered.find (i->first) != filtered.end()) {
@@ -121,10 +128,10 @@ Sequence<Time>::const_iterator::const_iterator(const Sequence<Time>& seq, Time t
 		DEBUG_TRACE (DEBUG::Sequence, string_compose ("Iterator: control: %1\n", seq._type_map.to_symbol(i->first)));
 		double x, y;
 		bool ret;
-		if (_force_discrete) {
-			ret = i->second->list()->rt_safe_earliest_event_discrete_unlocked (t, x, y, true);
+		if (_force_discrete || i->second->list()->interpolation() == ControlList::Discrete) {
+			ret = i->second->list()->rt_safe_earliest_event_discrete_unlocked (t.to_double(), x, y, true);
 		} else {
-			ret = i->second->list()->rt_safe_earliest_event_unlocked(t, x, y, true);
+			ret = i->second->list()->rt_safe_earliest_event_unlocked(t.to_double(), x, y, true);
 		}
 		if (!ret) {
 			DEBUG_TRACE (DEBUG::Sequence, string_compose ("Iterator: CC %1 (size %2) has no events past %3\n",
@@ -134,9 +141,10 @@ Sequence<Time>::const_iterator::const_iterator(const Sequence<Time>& seq, Time t
 
 		assert(x >= 0);
 
-		if (y < i->first.min() || y > i->first.max()) {
+		const ParameterDescriptor& desc = seq.type_map().descriptor(i->first);
+		if (y < desc.lower || y > desc.upper) {
 			cerr << "ERROR: Controller value " << y
-			     << " out of range [" << i->first.min() << "," << i->first.max()
+			     << " out of range [" << desc.lower << "," << desc.upper
 			     << "], event ignored" << endl;
 			continue;
 		}
@@ -147,106 +155,155 @@ Sequence<Time>::const_iterator::const_iterator(const Sequence<Time>& seq, Time t
 		_control_iters.push_back(new_iter);
 
 		// Found a new earliest_control
-		if (x < earliest_control.x) {
-			earliest_control = new_iter;
+		if (x < earliest_control_x) {
+			earliest_control_x     = x;
 			earliest_control_index = _control_iters.size() - 1;
-			found = true;
+			found                  = true;
 		}
 	}
 
 	if (found) {
 		_control_iter = _control_iters.begin() + earliest_control_index;
 		assert(_control_iter != _control_iters.end());
+		assert(_control_iter->list);
 	} else {
 		_control_iter = _control_iters.end();
 	}
 
-	// Now find the earliest event overall and point to it
-	Time earliest_t = t;
+	// Choose the earliest event overall to point to
+	choose_next(t);
+
+	// Allocate a new event for storing the current event in MIDI format
+	_event = boost::shared_ptr< Event<Time> >(
+		new Event<Time>(0, Time(), 4, NULL, true));
+
+	// Set event from chosen sub-iterator
+	set_event();
+
+	if (_is_end) {
+		DEBUG_TRACE(DEBUG::Sequence,
+		            string_compose("Starting at end @ %1\n", t));
+	} else {
+		DEBUG_TRACE(DEBUG::Sequence,
+		            string_compose("Starting at type 0x%1 : 0x%2 @ %3\n",
+		                           (int)_event->event_type(),
+		                           (int)((MIDIEvent<Time>*)_event.get())->type(),
+		                           _event->time()));
+	}
+}
+
+template<typename Time>
+Sequence<Time>::const_iterator::~const_iterator()
+{
+}
 
-	if (_note_iter != seq.notes().end()) {
-		_type = NOTE_ON;
+template<typename Time>
+void
+Sequence<Time>::const_iterator::invalidate()
+{
+	while (!_active_notes.empty()) {
+		_active_notes.pop();
+	}
+	_type = NIL;
+	_is_end = true;
+	if (_seq) {
+		_note_iter = _seq->notes().end();
+		_sysex_iter = _seq->sysexes().end();
+		_patch_change_iter = _seq->patch_changes().end();
+		_active_patch_change_message = 0;
+	}
+	_control_iters.clear();
+	_control_iter = _control_iters.end();
+	_lock.reset();
+}
+
+template<typename Time>
+Time
+Sequence<Time>::const_iterator::choose_next(Time earliest_t)
+{
+	_type = NIL;
+
+	// Next earliest note on
+	if (_note_iter != _seq->notes().end()) {
+		_type      = NOTE_ON;
 		earliest_t = (*_note_iter)->time();
 	}
 
-	if (_sysex_iter != seq.sysexes().end()
-	    && ((*_sysex_iter)->time() < earliest_t || _type == NIL)) {
-		_type = SYSEX;
-		earliest_t = (*_sysex_iter)->time();
+	// Use the next note off iff it's earlier or the same time as the note on
+	if ((!_active_notes.empty())) {
+		if (_type == NIL || _active_notes.top()->end_time() <= earliest_t) {
+			_type      = NOTE_OFF;
+			earliest_t = _active_notes.top()->end_time();
+		}
+	}
+
+	// Use the next earliest controller iff it's earlier than the note event
+	if (_control_iter != _control_iters.end() &&
+	    _control_iter->list && _control_iter->x != DBL_MAX) {
+		if (_type == NIL || _control_iter->x < earliest_t.to_double()) {
+			_type      = CONTROL;
+			earliest_t = Time(_control_iter->x);
+		}
 	}
 
-	if (_patch_change_iter != seq.patch_changes().end() && ((*_patch_change_iter)->time() < earliest_t || _type == NIL)) {
-		_type = PATCH_CHANGE;
-		earliest_t = (*_patch_change_iter)->time ();
+	// Use the next earliest SysEx iff it's earlier than the controller
+	if (_sysex_iter != _seq->sysexes().end()) {
+		if (_type == NIL || (*_sysex_iter)->time() < earliest_t) {
+			_type      = SYSEX;
+			earliest_t = (*_sysex_iter)->time();
+		}
 	}
 
-	if (_control_iter != _control_iters.end()
-	    && earliest_control.list && earliest_control.x >= t
-	    && (earliest_control.x < earliest_t || _type == NIL)) {
-		_type = CONTROL;
-		earliest_t = earliest_control.x;
+	// Use the next earliest patch change iff it's earlier than the SysEx
+	if (_patch_change_iter != _seq->patch_changes().end()) {
+		if (_type == NIL || (*_patch_change_iter)->time() < earliest_t) {
+			_type      = PATCH_CHANGE;
+			earliest_t = (*_patch_change_iter)->time();
+		}
 	}
+	return earliest_t;
+}
 
+template<typename Time>
+void
+Sequence<Time>::const_iterator::set_event()
+{
 	switch (_type) {
 	case NOTE_ON:
-		DEBUG_TRACE (DEBUG::Sequence, string_compose ("Starting at note on event @ %1\n", earliest_t));
-		_event = boost::shared_ptr<Event<Time> > (new Event<Time> ((*_note_iter)->on_event(), true));
+		DEBUG_TRACE(DEBUG::Sequence, "iterator = note on\n");
+		*_event = (*_note_iter)->on_event();
 		_active_notes.push(*_note_iter);
 		break;
+	case NOTE_OFF:
+		DEBUG_TRACE(DEBUG::Sequence, "iterator = note off\n");
+		assert(!_active_notes.empty());
+		*_event = _active_notes.top()->off_event();
+		_active_notes.pop();
+		break;
 	case SYSEX:
-		DEBUG_TRACE (DEBUG::Sequence, string_compose ("Starting at sysex event @ %1\n", earliest_t));
-		_event = boost::shared_ptr< Event<Time> >(
-			new Event<Time>(*(*_sysex_iter), true));
+		DEBUG_TRACE(DEBUG::Sequence, "iterator = sysex\n");
+		*_event = *(*_sysex_iter);
 		break;
 	case CONTROL:
-		DEBUG_TRACE (DEBUG::Sequence, string_compose ("Starting at control event @ %1\n", earliest_t));
-		seq.control_to_midi_event(_event, earliest_control);
+		DEBUG_TRACE(DEBUG::Sequence, "iterator = control\n");
+		_seq->control_to_midi_event(_event, *_control_iter);
 		break;
 	case PATCH_CHANGE:
-		DEBUG_TRACE (DEBUG::Sequence, string_compose ("Starting at patch change event @ %1\n", earliest_t));
-		_event = boost::shared_ptr<Event<Time> > (new Event<Time> ((*_patch_change_iter)->message (_active_patch_change_message), true));
+		DEBUG_TRACE(DEBUG::Sequence, "iterator = program change\n");
+		*_event = (*_patch_change_iter)->message (_active_patch_change_message);
 		break;
 	default:
+		_is_end = true;
 		break;
 	}
 
 	if (_type == NIL || !_event || _event->size() == 0) {
-		DEBUG_TRACE (DEBUG::Sequence, string_compose ("Starting at end @ %1\n", t));
+		DEBUG_TRACE(DEBUG::Sequence, "iterator = end\n");
 		_type   = NIL;
 		_is_end = true;
 	} else {
-		DEBUG_TRACE (DEBUG::Sequence, string_compose ("New iterator = 0x%1 : 0x%2 @ %3\n",
-		                                              (int)_event->event_type(),
-		                                              (int)((MIDIEvent<Time>*)_event.get())->type(),
-		                                              _event->time()));
-
 		assert(midi_event_is_valid(_event->buffer(), _event->size()));
 	}
-
-}
-
-template<typename Time>
-Sequence<Time>::const_iterator::~const_iterator()
-{
-}
-
-template<typename Time>
-void
-Sequence<Time>::const_iterator::invalidate()
-{
-	while (!_active_notes.empty()) {
-		_active_notes.pop();
-	}
-	_type = NIL;
-	_is_end = true;
-	if (_seq) {
-		_note_iter = _seq->notes().end();
-		_sysex_iter = _seq->sysexes().end();
-		_patch_change_iter = _seq->patch_changes().end();
-		_active_patch_change_message = 0;
-	}
-	_control_iter = _control_iters.end();
-	_lock.reset();
 }
 
 template<typename Time>
@@ -257,7 +314,6 @@ Sequence<Time>::const_iterator::operator++()
 		throw std::logic_error("Attempt to iterate past end of Sequence");
 	}
 
-	DEBUG_TRACE(DEBUG::Sequence, "Sequence::const_iterator++\n");
 	assert(_event && _event->buffer() && _event->size() > 0);
 
 	const MIDIEvent<Time>& ev = *((MIDIEvent<Time>*)_event.get());
@@ -287,12 +343,10 @@ Sequence<Time>::const_iterator::operator++()
 		// Increment current controller iterator
 		if (_force_discrete || _control_iter->list->interpolation() == ControlList::Discrete) {
 			ret = _control_iter->list->rt_safe_earliest_event_discrete_unlocked (
-				_control_iter->x, x, y, false
-			                                                                     );
+				_control_iter->x, x, y, false);
 		} else {
 			ret = _control_iter->list->rt_safe_earliest_event_linear_unlocked (
-				_control_iter->x + time_between_interpolated_controller_outputs, x, y, false
-			                                                                   );
+				_control_iter->x + time_between_interpolated_controller_outputs, x, y, false);
 		}
 		assert(!ret || x > _control_iter->x);
 		if (ret) {
@@ -327,77 +381,11 @@ Sequence<Time>::const_iterator::operator++()
 		assert(false);
 	}
 
-	// Now find the earliest event overall and point to it
-	_type = NIL;
-	Time earliest_t = std::numeric_limits<Time>::max();
-
-	// Next earliest note on
-	if (_note_iter != _seq->notes().end()) {
-		_type = NOTE_ON;
-		earliest_t = (*_note_iter)->time();
-	}
-
-	// Use the next note off iff it's earlier or the same time as the note on
-	if (!_seq->percussive() && (!_active_notes.empty())) {
-		if (_type == NIL || _active_notes.top()->end_time() <= earliest_t) {
-			_type = NOTE_OFF;
-			earliest_t = _active_notes.top()->end_time();
-		}
-	}
+	// Choose the earliest event overall to point to
+	choose_next(std::numeric_limits<Time>::max());
 
-	// Use the next earliest controller iff it's earlier than the note event
-	if (_control_iter != _control_iters.end() && _control_iter->x != DBL_MAX) {
-		if (_type == NIL || _control_iter->x < earliest_t) {
-			_type = CONTROL;
-			earliest_t = _control_iter->x;
-		}
-	}
-
-	// Use the next earliest SysEx iff it's earlier than the controller
-	if (_sysex_iter != _seq->sysexes().end()) {
-		if (_type == NIL || (*_sysex_iter)->time() < earliest_t) {
-			_type = SYSEX;
-			earliest_t = (*_sysex_iter)->time();
-		}
-	}
-
-	// Use the next earliest patch change iff it's earlier than the SysEx
-	if (_patch_change_iter != _seq->patch_changes().end()) {
-		if (_type == NIL || (*_patch_change_iter)->time() < earliest_t) {
-			_type = PATCH_CHANGE;
-			earliest_t = (*_patch_change_iter)->time();
-		}
-	}
-
-	// Set event to reflect new position
-	switch (_type) {
-	case NOTE_ON:
-		DEBUG_TRACE(DEBUG::Sequence, "iterator = note on\n");
-		*_event = (*_note_iter)->on_event();
-		_active_notes.push(*_note_iter);
-		break;
-	case NOTE_OFF:
-		DEBUG_TRACE(DEBUG::Sequence, "iterator = note off\n");
-		assert(!_active_notes.empty());
-		*_event = _active_notes.top()->off_event();
-		_active_notes.pop();
-		break;
-	case CONTROL:
-		DEBUG_TRACE(DEBUG::Sequence, "iterator = control\n");
-		_seq->control_to_midi_event(_event, *_control_iter);
-		break;
-	case SYSEX:
-		DEBUG_TRACE(DEBUG::Sequence, "iterator = sysex\n");
-		*_event = *(*_sysex_iter);
-		break;
-	case PATCH_CHANGE:
-		DEBUG_TRACE(DEBUG::Sequence, "iterator = patch change\n");
-		*_event = (*_patch_change_iter)->message (_active_patch_change_message);
-		break;
-	default:
-		DEBUG_TRACE(DEBUG::Sequence, "iterator = end\n");
-		_is_end = true;
-	}
+	// Set event from chosen sub-iterator
+	set_event();
 
 	assert(_is_end || (_event->size() > 0 && _event->buffer() && _event->buffer()[0] != '\0'));
 
@@ -460,7 +448,7 @@ Sequence<Time>::Sequence(const TypeMap& type_map)
 	, _overlap_pitch_resolution (FirstOnFirstOff)
 	, _writing(false)
 	, _type_map(type_map)
-	, _end_iter(*this, DBL_MAX, false, std::set<Evoral::Parameter> ())
+	, _end_iter(*this, std::numeric_limits<Time>::max(), false, std::set<Evoral::Parameter> ())
 	, _percussive(false)
 	, _lowest_note(127)
 	, _highest_note(0)
@@ -482,7 +470,7 @@ Sequence<Time>::Sequence(const Sequence<Time>& other)
 	, _overlap_pitch_resolution (other._overlap_pitch_resolution)
 	, _writing(false)
 	, _type_map(other._type_map)
-	, _end_iter(*this, DBL_MAX, false, std::set<Evoral::Parameter> ())
+	, _end_iter(*this, std::numeric_limits<Time>::max(), false, std::set<Evoral::Parameter> ())
 	, _percussive(other._percussive)
 	, _lowest_note(other._lowest_note)
 	, _highest_note(other._highest_note)
@@ -494,7 +482,7 @@ Sequence<Time>::Sequence(const Sequence<Time>& other)
 
 	for (typename SysExes::const_iterator i = other._sysexes.begin(); i != other._sysexes.end(); ++i) {
 		boost::shared_ptr<Event<Time> > n (new Event<Time> (**i, true));
-		_sysexes.push_back (n);
+		_sysexes.insert (n);
 	}
 
 	for (typename PatchChanges::const_iterator i = other._patch_changes.begin(); i != other._patch_changes.end(); ++i) {
@@ -527,7 +515,7 @@ Sequence<Time>::control_to_midi_event(
 
 	// initialize the event pointer with a new event, if necessary
 	if (!ev) {
-		ev = boost::shared_ptr< Event<Time> >(new Event<Time>(event_type, 0, 3, NULL, true));
+		ev = boost::shared_ptr< Event<Time> >(new Event<Time>(event_type, Time(), 3, NULL, true));
 	}
 
 	uint8_t midi_type = _type_map.parameter_midi_type(iter.list->parameter());
@@ -539,7 +527,7 @@ Sequence<Time>::control_to_midi_event(
 		assert(iter.list->parameter().id() <= INT8_MAX);
 		assert(iter.y <= INT8_MAX);
 
-		ev->set_time(iter.x);
+		ev->set_time(Time(iter.x));
 		ev->realloc(3);
 		ev->buffer()[0] = MIDI_CMD_CONTROL + iter.list->parameter().channel();
 		ev->buffer()[1] = (uint8_t)iter.list->parameter().id();
@@ -551,7 +539,7 @@ Sequence<Time>::control_to_midi_event(
 		assert(iter.list->parameter().channel() < 16);
 		assert(iter.y <= INT8_MAX);
 
-		ev->set_time(iter.x);
+		ev->set_time(Time(iter.x));
 		ev->realloc(2);
 		ev->buffer()[0] = MIDI_CMD_PGM_CHANGE + iter.list->parameter().channel();
 		ev->buffer()[1] = (uint8_t)iter.y;
@@ -562,7 +550,7 @@ Sequence<Time>::control_to_midi_event(
 		assert(iter.list->parameter().channel() < 16);
 		assert(iter.y < (1<<14));
 
-		ev->set_time(iter.x);
+		ev->set_time(Time(iter.x));
 		ev->realloc(3);
 		ev->buffer()[0] = MIDI_CMD_BENDER + iter.list->parameter().channel();
 		ev->buffer()[1] = uint16_t(iter.y) & 0x7F; // LSB
@@ -574,7 +562,7 @@ Sequence<Time>::control_to_midi_event(
 		assert(iter.list->parameter().channel() < 16);
 		assert(iter.y <= INT8_MAX);
 
-		ev->set_time(iter.x);
+		ev->set_time(Time(iter.x));
 		ev->realloc(2);
 		ev->buffer()[0] = MIDI_CMD_CHANNEL_PRESSURE + iter.list->parameter().channel();
 		ev->buffer()[1] = (uint8_t)iter.y;
@@ -636,13 +624,14 @@ Sequence<Time>::end_write (StuckNoteOption option, Time when)
 
 	DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1 : end_write (%2 notes) delete stuck option %3 @ %4\n", this, _notes.size(), option, when));
 
+	#ifdef PERCUSSIVE_IGNORE_NOTE_OFFS
 	if (!_percussive) {
-
+	#endif
 		for (typename Notes::iterator n = _notes.begin(); n != _notes.end() ;) {
 			typename Notes::iterator next = n;
 			++next;
 
-			if ((*n)->length() == 0) {
+			if (!(*n)->length()) {
 				switch (option) {
 				case Relax:
 					break;
@@ -665,7 +654,9 @@ Sequence<Time>::end_write (StuckNoteOption option, Time when)
 
 			n = next;
 		}
+	#ifdef PERCUSSIVE_IGNORE_NOTE_OFFS
 	}
+	#endif
 
 	for (int i = 0; i < 16; ++i) {
 		_write_notes[i].clear();
@@ -711,25 +702,27 @@ void
 Sequence<Time>::remove_note_unlocked(const constNotePtr note)
 {
 	bool erased = false;
+	bool id_matched = false;
 
-	_edited = true;
+	DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1 remove note #%2 %3 @ %4\n", this, note->id(), (int)note->note(), note->time()));
 
-	DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1 remove note %2 @ %3\n", this, (int)note->note(), note->time()));
+	/* first try searching for the note using the time index, which is
+	 * faster since the container is "indexed" by time. (technically, this
+	 * means that lower_bound() can do a binary search rather than linear)
+	 *
+	 * this may not work, for reasons explained below.
+	 */
 
-	typename Sequence<Time>::Notes::iterator i = note_lower_bound(note->time());
-	while (i != _notes.end() && (*i)->time() == note->time()) {
-
-		typename Sequence<Time>::Notes::iterator tmp = i;
-		++tmp;
+	typename Sequence<Time>::Notes::iterator i;
+		
+	for (i = note_lower_bound(note->time()); i != _notes.end() && (*i)->time() == note->time(); ++i) {
 
 		if (*i == note) {
 
-			NotePtr n = *i;
-
-			DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1\terasing note %2 @ %3\n", this, (int)(*i)->note(), (*i)->time()));
+			DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1\terasing note #%2 %3 @ %4\n", this, (*i)->id(), (int)(*i)->note(), (*i)->time()));
 			_notes.erase (i);
 
-			if (n->note() == _lowest_note || n->note() == _highest_note) {
+			if (note->note() == _lowest_note || note->note() == _highest_note) {
 
 				_lowest_note = 127;
 				_highest_note = 0;
@@ -743,30 +736,100 @@ Sequence<Time>::remove_note_unlocked(const constNotePtr note)
 			}
 
 			erased = true;
+			break;
 		}
+	}
 
-		i = tmp;
+	DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1\ttime-based lookup did not find note #%2 %3 @ %4\n", this, note->id(), (int)note->note(), note->time()));
+
+	if (!erased) {
+
+		/* if the note's time property was changed in tandem with some
+		 * other property as the next operation after it was added to
+		 * the sequence, then at the point where we call this to undo
+		 * the add, the note we are targetting currently has a
+		 * different time property than the one we we passed via
+		 * the argument.
+		 *
+		 * in this scenario, we have no choice other than to linear
+		 * search the list of notes and find the note by ID.
+		 */
+		
+		for (i = _notes.begin(); i != _notes.end(); ++i) {
+
+			if ((*i)->id() == note->id()) {
+				
+				DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1\tID-based pass, erasing note #%2 %3 @ %4\n", this, (*i)->id(), (int)(*i)->note(), (*i)->time()));
+				_notes.erase (i);
+				
+				if (note->note() == _lowest_note || note->note() == _highest_note) {
+					
+					_lowest_note = 127;
+					_highest_note = 0;
+					
+					for (typename Sequence<Time>::Notes::iterator ii = _notes.begin(); ii != _notes.end(); ++ii) {
+						if ((*ii)->note() < _lowest_note)
+							_lowest_note = (*ii)->note();
+						if ((*ii)->note() > _highest_note)
+							_highest_note = (*ii)->note();
+					}
+				}
+				
+				erased = true;
+				id_matched = true;
+				break;
+			}
+		}
 	}
+	
+	if (erased) {
 
-	Pitches& p (pitches (note->channel()));
+		Pitches& p (pitches (note->channel()));
+		
+		typename Pitches::iterator j;
 
-	NotePtr search_note(new Note<Time>(0, 0, 0, note->note(), 0));
+		/* if we had to ID-match above, we can't expect to find it in
+		 * pitches via note comparison either. so do another linear
+		 * search to locate it. otherwise, we can use the note index
+		 * to potentially speed things up.
+		 */
 
-	typename Pitches::iterator j = p.lower_bound (search_note);
-	while (j != p.end() && (*j)->note() == note->note()) {
-		typename Pitches::iterator tmp = j;
-		++tmp;
+		if (id_matched) {
 
-		if (*j == note) {
-			DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1\terasing pitch %2 @ %3\n", this, (int)(*j)->note(), (*j)->time()));
-			p.erase (j);
+			for (j = p.begin(); j != p.end(); ++j) {
+				if ((*j)->id() == note->id()) {
+					p.erase (j);
+					break;
+				}
+			}
+
+		} else {
+
+			/* Now find the same note in the "pitches" list (which indexes
+			 * notes by channel+time. We care only about its note number
+			 * so the search_note has all other properties unset.
+			 */
+			
+			NotePtr search_note (new Note<Time>(0, Time(), Time(), note->note(), 0));
+
+			for (j = p.lower_bound (search_note); j != p.end() && (*j)->note() == note->note(); ++j) {
+				
+				if ((*j) == note) {
+					DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1\terasing pitch %2 @ %3\n", this, (int)(*j)->note(), (*j)->time()));
+					p.erase (j);
+					break;
+				}
+			}
 		}
 
-		j = tmp;
-	}
+		if (j == p.end()) {
+			warning << string_compose ("erased note %1 not found in pitches for channel %2", *note, (int) note->channel()) << endmsg;
+		}
 
-	if (!erased) {
-		cerr << "Unable to find note to erase matching " << *note.get() << endl;
+		_edited = true;
+	
+	} else {
+		cerr << "Unable to find note to erase matching " << *note.get() << endmsg;
 	}
 }
 
@@ -775,12 +838,13 @@ void
 Sequence<Time>::remove_patch_change_unlocked (const constPatchChangePtr p)
 {
 	typename Sequence<Time>::PatchChanges::iterator i = patch_change_lower_bound (p->time ());
-	while (i != _patch_changes.end() && (*i)->time() == p->time()) {
+
+	while (i != _patch_changes.end() && ((*i)->time() == p->time())) {
 
 		typename Sequence<Time>::PatchChanges::iterator tmp = i;
 		++tmp;
 
-		if (*i == p) {
+		if (**i == *p) {
 			_patch_changes.erase (i);
 		}
 
@@ -788,6 +852,24 @@ Sequence<Time>::remove_patch_change_unlocked (const constPatchChangePtr p)
 	}
 }
 
+template<typename Time>
+void
+Sequence<Time>::remove_sysex_unlocked (const SysExPtr sysex)
+{
+	typename Sequence<Time>::SysExes::iterator i = sysex_lower_bound (sysex->time ());
+	while (i != _sysexes.end() && (*i)->time() == sysex->time()) {
+
+		typename Sequence<Time>::SysExes::iterator tmp = i;
+		++tmp;
+
+		if (*i == sysex) {
+			_sysexes.erase (i);
+		}
+
+		i = tmp;
+	}
+}
+
 /** Append \a ev to model.  NOT realtime safe.
  *
  * The timestamp of event is expected to be relative to
@@ -811,10 +893,10 @@ Sequence<Time>::append(const Event<Time>& event, event_id_t evid)
 	}
 
 	if (ev.is_note_on()) {
-		NotePtr note(new Note<Time>(ev.channel(), ev.time(), 0, ev.note(), ev.velocity()));
+		NotePtr note(new Note<Time>(ev.channel(), ev.time(), Time(), ev.note(), ev.velocity()));
 		append_note_on_unlocked (note, evid);
 	} else if (ev.is_note_off()) {
-		NotePtr note(new Note<Time>(ev.channel(), ev.time(), 0, ev.note(), ev.velocity()));
+		NotePtr note(new Note<Time>(ev.channel(), ev.time(), Time(), ev.note(), ev.velocity()));
 		/* XXX note: event ID is discarded because we merge the on+off events into
 		   a single note object
 		*/
@@ -832,20 +914,20 @@ Sequence<Time>::append(const Event<Time>& event, event_id_t evid)
 		}
 	} else if (ev.is_cc()) {
 		append_control_unlocked(
-			Evoral::MIDI::ContinuousController(ev.event_type(), ev.channel(), ev.cc_number()),
+			Parameter(ev.event_type(), ev.channel(), ev.cc_number()),
 			ev.time(), ev.cc_value(), evid);
 	} else if (ev.is_pgm_change()) {
 		/* write a patch change with this program change and any previously set-up bank number */
 		append_patch_change_unlocked (PatchChange<Time> (ev.time(), ev.channel(), ev.pgm_number(), _bank[ev.channel()]), evid);
 	} else if (ev.is_pitch_bender()) {
 		append_control_unlocked(
-			Evoral::MIDI::PitchBender(ev.event_type(), ev.channel()),
+			Parameter(ev.event_type(), ev.channel()),
 			ev.time(), double ((0x7F & ev.pitch_bender_msb()) << 7
 			                   | (0x7F & ev.pitch_bender_lsb())),
 			evid);
 	} else if (ev.is_channel_pressure()) {
 		append_control_unlocked(
-			Evoral::MIDI::ChannelPressure(ev.event_type(), ev.channel()),
+			Parameter(ev.event_type(), ev.channel()),
 			ev.time(), ev.channel_pressure(), evid);
 	} else if (!_type_map.type_is_midi(ev.event_type())) {
 		printf("WARNING: Sequence: Unknown event type %X: ", ev.event_type());
@@ -889,13 +971,20 @@ Sequence<Time>::append_note_on_unlocked (NotePtr note, event_id_t evid)
 
 	add_note_unlocked (note);
 
+	#ifdef PERCUSSIVE_IGNORE_NOTE_OFFS
 	if (!_percussive) {
+	#endif
+
 		DEBUG_TRACE (DEBUG::Sequence, string_compose ("Sustained: Appending active note on %1 channel %2\n",
 		                                              (unsigned)(uint8_t)note->note(), note->channel()));
 		_write_notes[note->channel()].insert (note);
+
+	#ifdef PERCUSSIVE_IGNORE_NOTE_OFFS
 	} else {
 		DEBUG_TRACE(DEBUG::Sequence, "Percussive: NOT appending active note on\n");
 	}
+	#endif
+
 }
 
 template<typename Time>
@@ -918,10 +1007,12 @@ Sequence<Time>::append_note_off_unlocked (NotePtr note)
 
 	_edited = true;
 
+#ifdef PERCUSSIVE_IGNORE_NOTE_OFFS
 	if (_percussive) {
 		DEBUG_TRACE(DEBUG::Sequence, "Sequence Ignoring note off (percussive mode)\n");
 		return;
 	}
+#endif
 
 	bool resolved = false;
 
@@ -964,10 +1055,10 @@ template<typename Time>
 void
 Sequence<Time>::append_control_unlocked(const Parameter& param, Time time, double value, event_id_t /* evid */)
 {
-	DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1 %2 @ %3\t=\t%4 # controls: %5\n",
+	DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1 %2 @ %3 = %4 # controls: %5\n",
 	                                              this, _type_map.to_symbol(param), time, value, _controls.size()));
 	boost::shared_ptr<Control> c = control(param, true);
-	c->list()->add (time, value);
+	c->list()->add (time.to_double(), value);
 	/* XXX control events should use IDs */
 }
 
@@ -984,7 +1075,7 @@ Sequence<Time>::append_sysex_unlocked(const MIDIEvent<Time>& ev, event_id_t /* e
 
 	boost::shared_ptr<MIDIEvent<Time> > event(new MIDIEvent<Time>(ev, true));
 	/* XXX sysex events should use IDs */
-	_sysexes.push_back(event);
+	_sysexes.insert(event);
 }
 
 template<typename Time>
@@ -1011,6 +1102,17 @@ Sequence<Time>::add_patch_change_unlocked (PatchChangePtr p)
 	_patch_changes.insert (p);
 }
 
+template<typename Time>
+void
+Sequence<Time>::add_sysex_unlocked (SysExPtr s)
+{
+	if (s->id () < 0) {
+		s->set_id (Evoral::next_event_id ());
+	}
+
+	_sysexes.insert (s);
+}
+
 template<typename Time>
 bool
 Sequence<Time>::contains (const NotePtr& note) const
@@ -1024,7 +1126,7 @@ bool
 Sequence<Time>::contains_unlocked (const NotePtr& note) const
 {
 	const Pitches& p (pitches (note->channel()));
-	NotePtr search_note(new Note<Time>(0, 0, 0, note->note()));
+	NotePtr search_note(new Note<Time>(0, Time(), Time(), note->note()));
 
 	for (typename Pitches::const_iterator i = p.lower_bound (search_note);
 	     i != p.end() && (*i)->note() == note->note(); ++i) {
@@ -1053,7 +1155,7 @@ Sequence<Time>::overlaps_unlocked (const NotePtr& note, const NotePtr& without)
 	Time ea  = note->end_time();
 
 	const Pitches& p (pitches (note->channel()));
-	NotePtr search_note(new Note<Time>(0, 0, 0, note->note()));
+	NotePtr search_note(new Note<Time>(0, Time(), Time(), note->note()));
 
 	for (typename Pitches::const_iterator i = p.lower_bound (search_note);
 	     i != p.end() && (*i)->note() == note->note(); ++i) {
@@ -1078,17 +1180,19 @@ Sequence<Time>::overlaps_unlocked (const NotePtr& note, const NotePtr& without)
 
 template<typename Time>
 void
-Sequence<Time>::set_notes (const Sequence<Time>::Notes& n)
+Sequence<Time>::set_notes (const typename Sequence<Time>::Notes& n)
 {
 	_notes = n;
 }
 
+// CONST iterator implementations (x3)
+
 /** Return the earliest note with time >= t */
 template<typename Time>
 typename Sequence<Time>::Notes::const_iterator
 Sequence<Time>::note_lower_bound (Time t) const
 {
-	NotePtr search_note(new Note<Time>(0, t, 0, 0, 0));
+	NotePtr search_note(new Note<Time>(0, t, Time(), 0, 0));
 	typename Sequence<Time>::Notes::const_iterator i = _notes.lower_bound(search_note);
 	assert(i == _notes.end() || (*i)->time() >= t);
 	return i;
@@ -1105,6 +1209,52 @@ Sequence<Time>::patch_change_lower_bound (Time t) const
 	return i;
 }
 
+/** Return the earliest sysex with time >= t */
+template<typename Time>
+typename Sequence<Time>::SysExes::const_iterator
+Sequence<Time>::sysex_lower_bound (Time t) const
+{
+	SysExPtr search (new Event<Time> (0, t));
+	typename Sequence<Time>::SysExes::const_iterator i = _sysexes.lower_bound (search);
+	assert (i == _sysexes.end() || (*i)->time() >= t);
+	return i;
+}
+
+// NON-CONST iterator implementations (x3)
+
+/** Return the earliest note with time >= t */
+template<typename Time>
+typename Sequence<Time>::Notes::iterator
+Sequence<Time>::note_lower_bound (Time t)
+{
+	NotePtr search_note(new Note<Time>(0, t, Time(), 0, 0));
+	typename Sequence<Time>::Notes::iterator i = _notes.lower_bound(search_note);
+	assert(i == _notes.end() || (*i)->time() >= t);
+	return i;
+}
+
+/** Return the earliest patch change with time >= t */
+template<typename Time>
+typename Sequence<Time>::PatchChanges::iterator
+Sequence<Time>::patch_change_lower_bound (Time t)
+{
+	PatchChangePtr search (new PatchChange<Time> (t, 0, 0, 0));
+	typename Sequence<Time>::PatchChanges::iterator i = _patch_changes.lower_bound (search);
+	assert (i == _patch_changes.end() || (*i)->time() >= t);
+	return i;
+}
+
+/** Return the earliest sysex with time >= t */
+template<typename Time>
+typename Sequence<Time>::SysExes::iterator
+Sequence<Time>::sysex_lower_bound (Time t)
+{
+	SysExPtr search (new Event<Time> (0, t));
+	typename Sequence<Time>::SysExes::iterator i = _sysexes.lower_bound (search);
+	assert (i == _sysexes.end() || (*i)->time() >= t);
+	return i;
+}
+
 template<typename Time>
 void
 Sequence<Time>::get_notes (Notes& n, NoteOperator op, uint8_t val, int chan_mask) const
@@ -1139,7 +1289,7 @@ Sequence<Time>::get_notes_by_pitch (Notes& n, NoteOperator op, uint8_t val, int
 		}
 
 		const Pitches& p (pitches (c));
-		NotePtr search_note(new Note<Time>(0, 0, 0, val, 0));
+		NotePtr search_note(new Note<Time>(0, Time(), Time(), val, 0));
 		typename Pitches::const_iterator i;
 		switch (op) {
 		case PitchEqual:
@@ -1175,8 +1325,7 @@ Sequence<Time>::get_notes_by_pitch (Notes& n, NoteOperator op, uint8_t val, int
 
 		default:
 			//fatal << string_compose (_("programming error: %1 %2", X_("get_notes_by_pitch() called with illegal operator"), op)) << endmsg;
-			abort ();
-			/* NOTREACHED*/
+			abort(); /* NOTREACHED*/
 		}
 	}
 }
@@ -1221,8 +1370,7 @@ Sequence<Time>::get_notes_by_velocity (Notes& n, NoteOperator op, uint8_t val, i
 			break;
 		default:
 			// fatal << string_compose (_("programming error: %1 %2", X_("get_notes_by_velocity() called with illegal operator"), op)) << endmsg;
-			abort ();
-			/* NOTREACHED*/
+			abort(); /* NOTREACHED*/
 
 		}
 	}
@@ -1259,4 +1407,3 @@ Sequence<Time>::dump (ostream& str) const
 template class Sequence<Evoral::MusicalTime>;
 
 } // namespace Evoral
-