X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_model.cc;h=13268cd84ad9c270896be0e94d278333d0910586;hb=8c04457be14673385287def048c387b3953fa8e8;hp=c9c71e7db931dafe5b5f5a6f9cf61b0ce9d0ee22;hpb=a42b9ff86e43974fcb775c084ceed2979f1724d9;p=ardour.git

diff --git a/libs/ardour/midi_model.cc b/libs/ardour/midi_model.cc
index c9c71e7db9..13268cd84a 100644
--- a/libs/ardour/midi_model.cc
+++ b/libs/ardour/midi_model.cc
@@ -33,6 +33,7 @@
 #include "midi++/events.h"
 
 #include "ardour/automation_control.h"
+#include "ardour/evoral_types_convert.h"
 #include "ardour/midi_automation_list_binder.h"
 #include "ardour/midi_model.h"
 #include "ardour/midi_source.h"
@@ -40,7 +41,13 @@
 #include "ardour/session.h"
 #include "ardour/types.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
+
+namespace PBD {
+	DEFINE_ENUM_CONVERT(ARDOUR::MidiModel::NoteDiffCommand::Property);
+	DEFINE_ENUM_CONVERT(ARDOUR::MidiModel::SysExDiffCommand::Property);
+	DEFINE_ENUM_CONVERT(ARDOUR::MidiModel::PatchChangeDiffCommand::Property);
+}
 
 using namespace std;
 using namespace ARDOUR;
@@ -59,7 +66,7 @@ MidiModel::MidiModel (boost::shared_ptr<MidiSource> s)
  * formality, until apply_command is called and ownership is taken.
  */
 MidiModel::NoteDiffCommand*
-MidiModel::new_note_diff_command (const string name)
+MidiModel::new_note_diff_command (const string& name)
 {
 	boost::shared_ptr<MidiSource> ms = _midi_source.lock ();
 	assert (ms);
@@ -69,7 +76,7 @@ MidiModel::new_note_diff_command (const string name)
 
 /** Start a new SysExDiff command */
 MidiModel::SysExDiffCommand*
-MidiModel::new_sysex_diff_command (const string name)
+MidiModel::new_sysex_diff_command (const string& name)
 {
 	boost::shared_ptr<MidiSource> ms = _midi_source.lock ();
 	assert (ms);
@@ -79,7 +86,7 @@ MidiModel::new_sysex_diff_command (const string name)
 
 /** Start a new PatchChangeDiff command */
 MidiModel::PatchChangeDiffCommand*
-MidiModel::new_patch_change_diff_command (const string name)
+MidiModel::new_patch_change_diff_command (const string& name)
 {
 	boost::shared_ptr<MidiSource> ms = _midi_source.lock ();
 	assert (ms);
@@ -96,10 +103,10 @@ MidiModel::new_patch_change_diff_command (const string name)
 void
 MidiModel::apply_command(Session& session, Command* cmd)
 {
-	session.begin_reversible_command(cmd->name());
+	session.begin_reversible_command (cmd->name());
 	(*cmd)();
-	session.commit_reversible_command(cmd);
-	set_edited(true);
+	session.commit_reversible_command (cmd);
+	set_edited (true);
 }
 
 /** Apply a command as part of a larger reversible transaction
@@ -111,8 +118,8 @@ void
 MidiModel::apply_command_as_subcommand(Session& session, Command* cmd)
 {
 	(*cmd)();
-	session.add_command(cmd);
-	set_edited(true);
+	session.add_command (cmd);
+	set_edited (true);
 }
 
 /************** DIFF COMMAND ********************/
@@ -180,7 +187,7 @@ MidiModel::NoteDiffCommand::get_value (const NotePtr note, Property prop)
 		return Variant(note->length());
 	}
 
-	return Variant ();
+	return Variant();
 }
 
 Variant::Type
@@ -321,7 +328,7 @@ MidiModel::NoteDiffCommand::operator() ()
 				_removed_notes.push_back (*i);
 			}
 		}
-		
+
 		if (!side_effect_removals.empty()) {
 			cerr << "SER: \n";
 			for (set<NotePtr>::iterator i = side_effect_removals.begin(); i != side_effect_removals.end(); ++i) {
@@ -364,7 +371,7 @@ MidiModel::NoteDiffCommand::undo ()
 				assert (i->note);
 			}
 		}
-				
+
 		for (ChangeList::iterator i = _changes.begin(); i != _changes.end(); ++i) {
 			Property prop = i->property;
 
@@ -439,7 +446,7 @@ MidiModel::NoteDiffCommand::undo ()
 			_model->add_note_unlocked (*i);
 		}
 	}
-	
+
 	_model->ContentsChanged(); /* EMIT SIGNAL */
 }
 
@@ -448,41 +455,12 @@ MidiModel::NoteDiffCommand::marshal_note(const NotePtr note)
 {
 	XMLNode* xml_note = new XMLNode("note");
 
-	{
-		ostringstream id_str(ios::ate);
-		id_str << int(note->id());
-		xml_note->add_property("id", id_str.str());
-	}
-
-	{
-		ostringstream note_str(ios::ate);
-		note_str << int(note->note());
-		xml_note->add_property("note", note_str.str());
-	}
-
-	{
-		ostringstream channel_str(ios::ate);
-		channel_str << int(note->channel());
-		xml_note->add_property("channel", channel_str.str());
-	}
-
-	{
-		ostringstream time_str(ios::ate);
-		time_str << note->time();
-		xml_note->add_property("time", time_str.str());
-	}
-
-	{
-		ostringstream length_str(ios::ate);
-		length_str << note->length();
-		xml_note->add_property("length", length_str.str());
-	}
-
-	{
-		ostringstream velocity_str(ios::ate);
-		velocity_str << (unsigned int) note->velocity();
-		xml_note->add_property("velocity", velocity_str.str());
-	}
+	xml_note->set_property ("id", note->id ());
+	xml_note->set_property ("note", note->note ());
+	xml_note->set_property ("channel", note->channel ());
+	xml_note->set_property ("time", note->time ());
+	xml_note->set_property ("length", note->length ());
+	xml_note->set_property ("velocity", note->velocity ());
 
 	return *xml_note;
 }
@@ -490,58 +468,38 @@ MidiModel::NoteDiffCommand::marshal_note(const NotePtr note)
 Evoral::Sequence<MidiModel::TimeType>::NotePtr
 MidiModel::NoteDiffCommand::unmarshal_note (XMLNode *xml_note)
 {
-	unsigned int note;
-	XMLProperty* prop;
-	unsigned int channel;
-	MidiModel::TimeType time;
-	MidiModel::TimeType length;
-	unsigned int velocity;
-	gint id;
-
-	if ((prop = xml_note->property("id")) != 0) {
-		istringstream id_str(prop->value());
-		id_str >> id;
-	} else {
+	Evoral::event_id_t id;
+	if (!xml_note->get_property ("id", id)) {
 		error << "note information missing ID value" << endmsg;
 		id = -1;
 	}
 
-	if ((prop = xml_note->property("note")) != 0) {
-		istringstream note_str(prop->value());
-		note_str >> note;
-	} else {
+	uint8_t note;
+	if (!xml_note->get_property("note", note)) {
 		warning << "note information missing note value" << endmsg;
 		note = 127;
 	}
 
-	if ((prop = xml_note->property("channel")) != 0) {
-		istringstream channel_str(prop->value());
-		channel_str >> channel;
-	} else {
+	uint8_t channel;
+	if (!xml_note->get_property("channel", channel)) {
 		warning << "note information missing channel" << endmsg;
 		channel = 0;
 	}
 
-	if ((prop = xml_note->property("time")) != 0) {
-		istringstream time_str(prop->value());
-		time_str >> time;
-	} else {
+	MidiModel::TimeType time;
+	if (!xml_note->get_property("time", time)) {
 		warning << "note information missing time" << endmsg;
 		time = MidiModel::TimeType();
 	}
 
-	if ((prop = xml_note->property("length")) != 0) {
-		istringstream length_str(prop->value());
-		length_str >> length;
-	} else {
+	MidiModel::TimeType length;
+	if (!xml_note->get_property("length", length)) {
 		warning << "note information missing length" << endmsg;
 		length = MidiModel::TimeType(1);
 	}
 
-	if ((prop = xml_note->property("velocity")) != 0) {
-		istringstream velocity_str(prop->value());
-		velocity_str >> velocity;
-	} else {
+	uint8_t velocity;
+	if (!xml_note->get_property("velocity", velocity)) {
 		warning << "note information missing velocity" << endmsg;
 		velocity = 127;
 	}
@@ -559,31 +517,28 @@ MidiModel::NoteDiffCommand::marshal_change (const NoteChange& change)
 
 	/* first, the change itself */
 
-	xml_change->add_property ("property", enum_2_string (change.property));
+	xml_change->set_property ("property", change.property);
 
-	{
-		ostringstream old_value_str (ios::ate);
-		if (change.property == StartTime || change.property == Length) {
-			old_value_str << change.old_value.get_beats();
-		} else {
-			old_value_str << change.old_value.get_int();
-		}
-		xml_change->add_property ("old", old_value_str.str());
+	if (change.property == StartTime || change.property == Length) {
+		xml_change->set_property ("old", change.old_value.get_beats ());
+	} else {
+		xml_change->set_property ("old", change.old_value.get_int ());
 	}
 
-	{
-		ostringstream new_value_str (ios::ate);
-		if (change.property == StartTime || change.property == Length) {
-			new_value_str << change.new_value.get_beats();
-		} else {
-			new_value_str << change.new_value.get_int();
-		}
-		xml_change->add_property ("new", new_value_str.str());
+	if (change.property == StartTime || change.property == Length) {
+		xml_change->set_property ("new", change.new_value.get_beats ());
+	} else {
+		xml_change->set_property ("new", change.new_value.get_int ());
 	}
 
-	ostringstream id_str;
-	id_str << change.note->id();
-	xml_change->add_property ("id", id_str.str());
+	if (change.note) {
+		xml_change->set_property ("id", change.note->id());
+	} else if (change.note_id) {
+		warning << _("Change has no note, using note ID") << endmsg;
+		xml_change->set_property ("id", change.note_id);
+	} else {
+		error << _("Change has no note or note ID") << endmsg;
+	}
 
 	return *xml_change;
 }
@@ -591,50 +546,39 @@ MidiModel::NoteDiffCommand::marshal_change (const NoteChange& change)
 MidiModel::NoteDiffCommand::NoteChange
 MidiModel::NoteDiffCommand::unmarshal_change (XMLNode *xml_change)
 {
-	XMLProperty* prop;
 	NoteChange change;
+	change.note_id = 0;
 
-	if ((prop = xml_change->property("property")) != 0) {
-		change.property = (Property) string_2_enum (prop->value(), change.property);
-	} else {
+	if (!xml_change->get_property("property", change.property)) {
 		fatal << "!!!" << endmsg;
 		abort(); /*NOTREACHED*/
 	}
 
-	if ((prop = xml_change->property ("id")) == 0) {
+	int note_id;
+	if (!xml_change->get_property ("id", note_id)) {
 		error << _("No NoteID found for note property change - ignored") << endmsg;
 		return change;
 	}
 
-	gint note_id = atoi (prop->value().c_str());
-
-	if ((prop = xml_change->property ("old")) != 0) {
-		istringstream old_str (prop->value());
-		if (change.property == StartTime || change.property == Length) {
-			Evoral::MusicalTime old_time;
-			old_str >> old_time;
-			change.old_value = old_time;
-		} else {
-			int integer_value_so_that_istream_does_the_right_thing;
-			old_str >> integer_value_so_that_istream_does_the_right_thing;
-			change.old_value = integer_value_so_that_istream_does_the_right_thing;
-		}
+	int old_val;
+	Evoral::Beats old_time;
+	if ((change.property == StartTime || change.property == Length) &&
+	    xml_change->get_property ("old", old_time)) {
+		change.old_value = old_time;
+	} else if (xml_change->get_property ("old", old_val)) {
+		change.old_value = old_val;
 	} else {
 		fatal << "!!!" << endmsg;
 		abort(); /*NOTREACHED*/
 	}
 
-	if ((prop = xml_change->property ("new")) != 0) {
-		istringstream new_str (prop->value());
-		if (change.property == StartTime || change.property == Length) {
-			Evoral::MusicalTime new_time;
-			new_str >> new_time;
-			change.new_value = Variant(new_time);
-		} else {
-			int integer_value_so_that_istream_does_the_right_thing;
-			new_str >> integer_value_so_that_istream_does_the_right_thing;
-			change.new_value = integer_value_so_that_istream_does_the_right_thing;
-		}
+	int new_val;
+	Evoral::Beats new_time;
+	if ((change.property == StartTime || change.property == Length) &&
+	    xml_change->get_property ("new", new_time)) {
+		change.new_value = new_time;
+	} else if (xml_change->get_property ("new", new_val)) {
+		change.new_value = new_val;
 	} else {
 		fatal << "!!!" << endmsg;
 		abort(); /*NOTREACHED*/
@@ -714,7 +658,7 @@ XMLNode&
 MidiModel::NoteDiffCommand::get_state ()
 {
 	XMLNode* diff_command = new XMLNode (NOTE_DIFF_COMMAND_ELEMENT);
-	diff_command->add_property("midi-source", _model->midi_source()->id().to_s());
+	diff_command->set_property("midi-source", _model->midi_source()->id().to_s());
 
 	XMLNode* changes = diff_command->add_child(DIFF_NOTES_ELEMENT);
 	for_each(_changes.begin(), _changes.end(),
@@ -843,23 +787,10 @@ MidiModel::SysExDiffCommand::marshal_change (const Change& change)
 
 	/* first, the change itself */
 
-	xml_change->add_property ("property", enum_2_string (change.property));
-
-	{
-		ostringstream old_value_str (ios::ate);
-		old_value_str << change.old_time;
-		xml_change->add_property ("old", old_value_str.str());
-	}
-
-	{
-		ostringstream new_value_str (ios::ate);
-		new_value_str << change.new_time;
-		xml_change->add_property ("new", new_value_str.str());
-	}
-
-	ostringstream id_str;
-	id_str << change.sysex->id();
-	xml_change->add_property ("id", id_str.str());
+	xml_change->set_property ("property", change.property);
+	xml_change->set_property ("old", change.old_time);
+	xml_change->set_property ("new", change.new_time);
+	xml_change->set_property ("id", change.sysex->id());
 
 	return *xml_change;
 }
@@ -867,35 +798,25 @@ MidiModel::SysExDiffCommand::marshal_change (const Change& change)
 MidiModel::SysExDiffCommand::Change
 MidiModel::SysExDiffCommand::unmarshal_change (XMLNode *xml_change)
 {
-	XMLProperty* prop;
 	Change change;
 
-	if ((prop = xml_change->property ("property")) != 0) {
-		change.property = (Property) string_2_enum (prop->value(), change.property);
-	} else {
+	if (!xml_change->get_property ("property", change.property)) {
 		fatal << "!!!" << endmsg;
 		abort(); /*NOTREACHED*/
 	}
 
-	if ((prop = xml_change->property ("id")) == 0) {
+	int sysex_id;
+	if (!xml_change->get_property ("id", sysex_id)) {
 		error << _("No SysExID found for sys-ex property change - ignored") << endmsg;
 		return change;
 	}
 
-	gint sysex_id = atoi (prop->value().c_str());
-
-	if ((prop = xml_change->property ("old")) != 0) {
-		istringstream old_str (prop->value());
-		old_str >> change.old_time;
-	} else {
+	if (!xml_change->get_property ("old", change.old_time)) {
 		fatal << "!!!" << endmsg;
 		abort(); /*NOTREACHED*/
 	}
 
-	if ((prop = xml_change->property ("new")) != 0) {
-		istringstream new_str (prop->value());
-		new_str >> change.new_time;
-	} else {
+	if (!xml_change->get_property ("new", change.new_time)) {
 		fatal << "!!!" << endmsg;
 		abort(); /*NOTREACHED*/
 	}
@@ -937,7 +858,7 @@ XMLNode&
 MidiModel::SysExDiffCommand::get_state ()
 {
 	XMLNode* diff_command = new XMLNode (SYSEX_DIFF_COMMAND_ELEMENT);
-	diff_command->add_property ("midi-source", _model->midi_source()->id().to_s());
+	diff_command->set_property ("midi-source", _model->midi_source()->id().to_s());
 
 	XMLNode* changes = diff_command->add_child(DIFF_SYSEXES_ELEMENT);
 	for_each (_changes.begin(), _changes.end(),
@@ -1143,35 +1064,11 @@ MidiModel::PatchChangeDiffCommand::marshal_patch_change (constPatchChangePtr p)
 {
 	XMLNode* n = new XMLNode ("patch-change");
 
-	{
-		ostringstream s (ios::ate);
-		s << int (p->id ());
-		n->add_property ("id", s.str());
-	}
-
-	{
-		ostringstream s (ios::ate);
-		s << p->time ();
-		n->add_property ("time", s.str ());
-	}
-
-	{
-		ostringstream s (ios::ate);
-		s << int (p->channel ());
-		n->add_property ("channel", s.str ());
-	}
-
-	{
-		ostringstream s (ios::ate);
-		s << int (p->program ());
-		n->add_property ("program", s.str ());
-	}
-
-	{
-		ostringstream s (ios::ate);
-		s << int (p->bank ());
-		n->add_property ("bank", s.str ());
-	}
+	n->set_property ("id", p->id ());
+	n->set_property ("time", p->time ());
+	n->set_property ("channel", p->channel ());
+	n->set_property ("program", p->program ());
+	n->set_property ("bank", p->bank ());
 
 	return *n;
 }
@@ -1181,44 +1078,29 @@ MidiModel::PatchChangeDiffCommand::marshal_change (const Change& c)
 {
 	XMLNode* n = new XMLNode (X_("Change"));
 
-	n->add_property (X_("property"), enum_2_string (c.property));
-
-	{
-		ostringstream s (ios::ate);
-		if (c.property == Time) {
-			s << c.old_time;
-		} else if (c.property == Channel) {
-			s << c.old_channel;
-		} else if (c.property == Program) {
-			s << int (c.old_program);
-		} else if (c.property == Bank) {
-			s << c.old_bank;
-		}
+	n->set_property (X_("property"), c.property);
 
-		n->add_property (X_("old"), s.str ());
+	if (c.property == Time) {
+		n->set_property (X_("old"), c.old_time);
+	} else if (c.property == Channel) {
+		n->set_property (X_("old"), c.old_channel);
+	} else if (c.property == Program) {
+		n->set_property (X_("old"), c.old_program);
+	} else if (c.property == Bank) {
+		n->set_property (X_("old"), c.old_bank);
 	}
 
-	{
-		ostringstream s (ios::ate);
-
-		if (c.property == Time) {
-			s << c.new_time;
-		} else if (c.property == Channel) {
-			s << c.new_channel;
-		} else if (c.property == Program) {
-			s << int (c.new_program);
-		} else if (c.property == Bank) {
-			s << c.new_bank;
-		}
-
-		n->add_property (X_("new"), s.str ());
+	if (c.property == Time) {
+		n->set_property (X_ ("new"), c.new_time);
+	} else if (c.property == Channel) {
+		n->set_property (X_ ("new"), c.new_channel);
+	} else if (c.property == Program) {
+		n->set_property (X_ ("new"), c.new_program);
+	} else if (c.property == Bank) {
+		n->set_property (X_ ("new"), c.new_bank);
 	}
 
-	{
-		ostringstream s;
-		s << c.patch->id ();
-		n->add_property ("id", s.str ());
-	}
+	n->set_property ("id", c.patch->id ());
 
 	return *n;
 }
@@ -1226,40 +1108,32 @@ MidiModel::PatchChangeDiffCommand::marshal_change (const Change& c)
 MidiModel::PatchChangePtr
 MidiModel::PatchChangeDiffCommand::unmarshal_patch_change (XMLNode* n)
 {
-	XMLProperty* prop;
 	Evoral::event_id_t id = 0;
-	Evoral::MusicalTime time = Evoral::MusicalTime();
-	int channel = 0;
-	int program = 0;
-	int bank = 0;
-	
-	if ((prop = n->property ("id")) != 0) {
-		istringstream s (prop->value());
-		s >> id;
+	if (!n->get_property ("id", id)) {
+		assert(false);
 	}
 
-	if ((prop = n->property ("time")) != 0) {
-		istringstream s (prop->value ());
-		s >> time;
+	Evoral::Beats time = Evoral::Beats();
+	if (!n->get_property ("time", time)) {
+		// warning??
 	}
 
-	if ((prop = n->property ("channel")) != 0) {
-		istringstream s (prop->value ());
-		s >> channel;
+	uint8_t channel = 0;
+	if (!n->get_property ("channel", channel)) {
+		// warning??
 	}
 
-	if ((prop = n->property ("program")) != 0) {
-		istringstream s (prop->value ());
-		s >> program;
+	int program = 0;
+	if (!n->get_property ("program", program)) {
+		// warning??
 	}
 
-	if ((prop = n->property ("bank")) != 0) {
-		istringstream s (prop->value ());
-		s >> bank;
+	int bank = 0;
+	if (!n->get_property ("bank", bank)) {
+		// warning??
 	}
 
 	PatchChangePtr p (new Evoral::PatchChange<TimeType> (time, channel, program, bank));
-	assert(id);
 	p->set_id (id);
 	return p;
 }
@@ -1267,57 +1141,25 @@ MidiModel::PatchChangeDiffCommand::unmarshal_patch_change (XMLNode* n)
 MidiModel::PatchChangeDiffCommand::Change
 MidiModel::PatchChangeDiffCommand::unmarshal_change (XMLNode* n)
 {
-	XMLProperty* prop;
 	Change c;
-	int an_int;
-
-	prop = n->property ("property");
-	assert (prop);
-	c.property = (Property) string_2_enum (prop->value(), c.property);
+	Evoral::event_id_t id;
 
-	prop = n->property ("id");
-	assert (prop);
-	Evoral::event_id_t const id = atoi (prop->value().c_str());
-
-	/* we need to load via an int intermediate for all properties that are 
-	   actually uint8_t (char/byte).
-	*/
+	if (!n->get_property ("property", c.property) || !n->get_property ("id", id)) {
+		assert(false);
+	}
 
-	prop = n->property ("old");
-	assert (prop);
-	{
-		istringstream s (prop->value ());
-		if (c.property == Time) {
-			s >> c.old_time;
-		} else if (c.property == Channel) {
-			s >> an_int;
-			c.old_channel = an_int;
-		} else if (c.property == Program) {
-			s >> an_int;
-			c.old_program = an_int;
-		} else if (c.property == Bank) {
-			s >> an_int;
-			c.old_bank = an_int;
-		}
+	if ((c.property == Time && !n->get_property ("old", c.old_time)) ||
+	    (c.property == Channel && !n->get_property ("old", c.old_channel)) ||
+	    (c.property == Program && !n->get_property ("old", c.old_program)) ||
+	    (c.property == Bank && !n->get_property ("old", c.old_bank))) {
+		assert (false);
 	}
 
-	prop = n->property ("new");
-	assert (prop);
-	{
-		istringstream s (prop->value ());
-
-		if (c.property == Time) {
-			s >> c.new_time;
-		} else if (c.property == Channel) {
-			s >> an_int;
-			c.new_channel = an_int;
-		} else if (c.property == Program) {
-			s >> an_int;
-			c.new_program = an_int;
-		} else if (c.property == Bank) {
-			s >> an_int;
-			c.new_bank = an_int;
-		}
+	if ((c.property == Time && !n->get_property ("new", c.new_time)) ||
+	    (c.property == Channel && !n->get_property ("new", c.new_channel)) ||
+	    (c.property == Program && !n->get_property ("new", c.new_program)) ||
+	    (c.property == Bank && !n->get_property ("new", c.new_bank))) {
+		assert (false);
 	}
 
 	c.patch = _model->find_patch_change (id);
@@ -1361,7 +1203,7 @@ XMLNode &
 MidiModel::PatchChangeDiffCommand::get_state ()
 {
 	XMLNode* diff_command = new XMLNode (PATCH_CHANGE_DIFF_COMMAND_ELEMENT);
-	diff_command->add_property("midi-source", _model->midi_source()->id().to_s());
+	diff_command->set_property("midi-source", _model->midi_source()->id().to_s());
 
 	XMLNode* added = diff_command->add_child (ADDED_PATCH_CHANGES_ELEMENT);
 	for_each (_added.begin(), _added.end(),
@@ -1443,6 +1285,10 @@ MidiModel::sync_to_source (const Glib::Threads::Mutex::Lock& source_lock)
 		return false;
 	}
 
+	/* Invalidate and store active notes, which will be picked up by the iterator
+	   on the next roll if time progresses linearly. */
+	ms->invalidate(source_lock);
+
 	ms->mark_streaming_midi_write_started (source_lock, note_mode());
 
 	for (Evoral::Sequence<TimeType>::const_iterator i = begin(TimeType(), true); i != end(); ++i) {
@@ -1467,8 +1313,9 @@ MidiModel::sync_to_source (const Glib::Threads::Mutex::Lock& source_lock)
 bool
 MidiModel::write_section_to (boost::shared_ptr<MidiSource>     source,
                              const Glib::Threads::Mutex::Lock& source_lock,
-                             Evoral::MusicalTime               begin_time,
-                             Evoral::MusicalTime               end_time)
+                             TimeType                          begin_time,
+                             TimeType                          end_time,
+                             bool                              offset_events)
 {
 	ReadLock lock(read_lock());
 	MidiStateTracker mst;
@@ -1480,21 +1327,17 @@ MidiModel::write_section_to (boost::shared_ptr<MidiSource>     source,
 	source->mark_streaming_midi_write_started (source_lock, note_mode());
 
 	for (Evoral::Sequence<TimeType>::const_iterator i = begin(TimeType(), true); i != end(); ++i) {
-		const Evoral::Event<Evoral::MusicalTime>& ev (*i);
-
-		if (ev.time() >= begin_time && ev.time() < end_time) {
+		if (i->time() >= begin_time && i->time() < end_time) {
 
-			const Evoral::MIDIEvent<Evoral::MusicalTime>* mev =
-				static_cast<const Evoral::MIDIEvent<Evoral::MusicalTime>* > (&ev);
+			Evoral::Event<TimeType> mev (*i, true); /* copy the event */
 
-			if (!mev) {
-				continue;
+			if (offset_events) {
+				mev.set_time(mev.time() - begin_time);
 			}
 
+			if (mev.is_note_off()) {
 
-			if (mev->is_note_off()) {
-
-				if (!mst.active (mev->note(), mev->channel())) {
+				if (!mst.active (mev.note(), mev.channel())) {
 					/* the matching note-on was outside the
 					   time range we were given, so just
 					   ignore this note-off.
@@ -1502,18 +1345,21 @@ MidiModel::write_section_to (boost::shared_ptr<MidiSource>     source,
 					continue;
 				}
 
-				source->append_event_beats (source_lock, *i);
-				mst.remove (mev->note(), mev->channel());
+				source->append_event_beats (source_lock, mev);
+				mst.remove (mev.note(), mev.channel());
 
-			} else if (mev->is_note_on()) {
-				mst.add (mev->note(), mev->channel());
-				source->append_event_beats(source_lock, *i);
+			} else if (mev.is_note_on()) {
+				mst.add (mev.note(), mev.channel());
+				source->append_event_beats(source_lock, mev);
 			} else {
-				source->append_event_beats(source_lock, *i);
+				source->append_event_beats(source_lock, mev);
 			}
 		}
 	}
 
+	if (offset_events) {
+		end_time -= begin_time;
+	}
 	mst.resolve_notes (*source, source_lock, end_time);
 
 	set_percussive(old_percussive);
@@ -1602,25 +1448,18 @@ MidiModel::find_sysex (gint sysex_id)
 MidiModel::WriteLock
 MidiModel::edit_lock()
 {
-	boost::shared_ptr<MidiSource> ms = _midi_source.lock ();
-	assert (ms);
-
-	Glib::Threads::Mutex::Lock* source_lock = new Glib::Threads::Mutex::Lock (ms->mutex());
-	ms->invalidate(*source_lock); // Release cached iterator's read lock on model
-	return WriteLock(new WriteLockImpl(source_lock, _lock, _control_lock));
-}
+	boost::shared_ptr<MidiSource> ms          = _midi_source.lock();
+	Glib::Threads::Mutex::Lock*   source_lock = 0;
 
-/** Lock just the model, the source lock must already be held.
- * This should only be called from libardour/evoral places
- */
-MidiModel::WriteLock
-MidiModel::write_lock()
-{
-	boost::shared_ptr<MidiSource> ms = _midi_source.lock ();
-	assert (ms);
+	if (ms) {
+		/* Take source lock and invalidate iterator to release its lock on model.
+		   Add currently active notes to _active_notes so we can restore them
+		   if playback resumes at the same point after the edit. */
+		source_lock = new Glib::Threads::Mutex::Lock(ms->mutex());
+		ms->invalidate(*source_lock);
+	}
 
-	assert (!ms->mutex().trylock ());
-	return WriteLock(new WriteLockImpl(0, _lock, _control_lock));
+	return WriteLock(new WriteLockImpl(source_lock, _lock, _control_lock));
 }
 
 int
@@ -1656,9 +1495,9 @@ MidiModel::resolve_overlaps_unlocked (const NotePtr note, void* arg)
 
 		if ((sb > sa) && (eb <= ea)) {
 			overlap = OverlapInternal;
-		} else if ((eb >= sa) && (eb <= ea)) {
+		} else if ((eb > sa) && (eb <= ea)) {
 			overlap = OverlapStart;
-		} else if ((sb > sa) && (sb <= ea)) {
+		} else if ((sb > sa) && (sb < ea)) {
 			overlap = OverlapEnd;
 		} else if ((sa >= sb) && (sa <= eb) && (ea <= eb)) {
 			overlap = OverlapExternal;
@@ -1972,52 +1811,28 @@ MidiModel::insert_silence_at_start (TimeType t)
 
 		apply_command_as_subcommand (s->session(), c);
 	}
+
+	ContentsShifted (t.to_double());
 }
 
-/** Transpose notes in a time range by a given number of semitones.  Notes
- *  will be clamped at 0 and 127 if the transposition would make them exceed
- *  that range.
- *
- *  @param from Start time.
- *  @param end End time.
- *  @param semitones Number of semitones to transpose by (+ve is higher, -ve is lower).
- */
 void
-MidiModel::transpose (TimeType from, TimeType to, int semitones)
+MidiModel::transpose (NoteDiffCommand* c, const NotePtr note_ptr, int semitones)
 {
-	boost::shared_ptr<const MidiSource> s = midi_source ();
-
-	NoteDiffCommand* c = new_note_diff_command (_("transpose"));
-
-	for (Notes::iterator i = notes().begin(); i != notes().end(); ++i) {
-
-		if ((*i)->time() >= to) {
-
-			/* finished */
-			break;
+	int new_note = note_ptr->note() + semitones;
 
-		} else if ((*i)->time() >= from) {
-
-			int new_note = (*i)->note() + semitones;
-
-			if (new_note < 0) {
-				new_note = 0;
-			} else if (new_note > 127) {
-				new_note = 127;
-			}
-
-			c->change (*i, NoteDiffCommand::NoteNumber, (uint8_t) new_note);
-
-		}
+	if (new_note < 0) {
+		new_note = 0;
+	} else if (new_note > 127) {
+		new_note = 127;
 	}
 
-	apply_command (s->session (), c);
+	c->change (note_ptr, NoteDiffCommand::NoteNumber, (uint8_t) new_note);
 }
 
 void
 MidiModel::control_list_marked_dirty ()
 {
-	AutomatableSequence<Evoral::MusicalTime>::control_list_marked_dirty ();
-	
+	AutomatableSequence<Evoral::Beats>::control_list_marked_dirty ();
+
 	ContentsChanged (); /* EMIT SIGNAL */
 }