Fix broken whitespace. I'd apologize for the compile times if it was my fault :D
[ardour.git] / libs / ardour / midi_model.cc
index 8a62eba8a6a532d33fe262822b46984177967321..b6500563ba46604a376bd43548cf42baba6efb5a 100644 (file)
 /*
- Copyright (C) 2007 Paul Davis 
- Written by Dave Robillard, 2007
+  Copyright (C) 2007 Paul Davis
+  Author: David Robillard
 
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
 (at your option) any later version.
 
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
- */
-
-#define __STDC_LIMIT_MACROS 1
+*/
 
+#include <set>
 #include <iostream>
 #include <algorithm>
 #include <stdexcept>
 #include <stdint.h>
-#include <pbd/enumwriter.h>
-#include <midi++/events.h>
+#include "pbd/error.h"
+#include "pbd/enumwriter.h"
+#include "pbd/compose.h"
+#include "midi++/events.h"
 
-#include <ardour/midi_model.h>
-#include <ardour/midi_source.h>
-#include <ardour/types.h>
-#include <ardour/session.h>
+#include "ardour/midi_model.h"
+#include "ardour/midi_source.h"
+#include "ardour/midi_state_tracker.h"
+#include "ardour/smf_source.h"
+#include "ardour/types.h"
+#include "ardour/session.h"
+#include "ardour/midi_automation_list_binder.h"
+
+#include "i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
+using namespace PBD;
+
+MidiModel::MidiModel (boost::shared_ptr<MidiSource> s)
+       : AutomatableSequence<TimeType>(s->session())
+{
+       set_midi_source (s);
+}
+
+/** Start a new NoteDiff command.
+ *
+ * This has no side-effects on the model or Session, the returned command
+ * can be held on to for as long as the caller wishes, or discarded without
+ * formality, until apply_command is called and ownership is taken.
+ */
+MidiModel::NoteDiffCommand*
+MidiModel::new_note_diff_command (const string name)
+{
+       boost::shared_ptr<MidiSource> ms = _midi_source.lock ();
+       assert (ms);
+
+       return new NoteDiffCommand (ms->model(), name);
+}
+
+/** Start a new SysExDiff command */
+MidiModel::SysExDiffCommand*
+MidiModel::new_sysex_diff_command (const string name)
+{
+       boost::shared_ptr<MidiSource> ms = _midi_source.lock ();
+       assert (ms);
+
+       return new SysExDiffCommand (ms->model(), name);
+}
+
+/** Start a new PatchChangeDiff command */
+MidiModel::PatchChangeDiffCommand*
+MidiModel::new_patch_change_diff_command (const string name)
+{
+       boost::shared_ptr<MidiSource> ms = _midi_source.lock ();
+       assert (ms);
+
+       return new PatchChangeDiffCommand (ms->model(), name);
+}
+
+
+/** Apply a command.
+ *
+ * Ownership of cmd is taken, it must not be deleted by the caller.
+ * The command will constitute one item on the undo stack.
+ */
+void
+MidiModel::apply_command(Session& session, Command* cmd)
+{
+       session.begin_reversible_command(cmd->name());
+       (*cmd)();
+       session.commit_reversible_command(cmd);
+       set_edited(true);
+}
+
+/** Apply a command as part of a larger reversible transaction
+ *
+ * Ownership of cmd is taken, it must not be deleted by the caller.
+ * The command will constitute one item on the undo stack.
+ */
+void
+MidiModel::apply_command_as_subcommand(Session& session, Command* cmd)
+{
+       (*cmd)();
+       session.add_command(cmd);
+       set_edited(true);
+}
+
+/************** DIFF COMMAND ********************/
+
+#define NOTE_DIFF_COMMAND_ELEMENT "NoteDiffCommand"
+#define DIFF_NOTES_ELEMENT "ChangedNotes"
+#define ADDED_NOTES_ELEMENT "AddedNotes"
+#define REMOVED_NOTES_ELEMENT "RemovedNotes"
+#define SIDE_EFFECT_REMOVALS_ELEMENT "SideEffectRemovals"
+#define SYSEX_DIFF_COMMAND_ELEMENT "SysExDiffCommand"
+#define DIFF_SYSEXES_ELEMENT "ChangedSysExes"
+#define PATCH_CHANGE_DIFF_COMMAND_ELEMENT "PatchChangeDiffCommand"
+#define ADDED_PATCH_CHANGES_ELEMENT "AddedPatchChanges"
+#define REMOVED_PATCH_CHANGES_ELEMENT "RemovedPatchChanges"
+#define DIFF_PATCH_CHANGES_ELEMENT "ChangedPatchChanges"
+
+MidiModel::DiffCommand::DiffCommand(boost::shared_ptr<MidiModel> m, const std::string& name)
+       : Command (name)
+       , _model (m)
+       , _name (name)
+{
+       assert(_model);
+}
+
+MidiModel::NoteDiffCommand::NoteDiffCommand (boost::shared_ptr<MidiModel> m, const XMLNode& node)
+       : DiffCommand (m, "")
+{
+       assert (_model);
+       set_state (node, Stateful::loading_state_version);
+}
+
+void
+MidiModel::NoteDiffCommand::add (const NotePtr note)
+{
+       _removed_notes.remove(note);
+       _added_notes.push_back(note);
+}
+
+void
+MidiModel::NoteDiffCommand::remove (const NotePtr note)
+{
+       _added_notes.remove(note);
+       _removed_notes.push_back(note);
+}
+
+void
+MidiModel::NoteDiffCommand::side_effect_remove (const NotePtr note)
+{
+       side_effect_removals.insert (note);
+}
+
+void
+MidiModel::NoteDiffCommand::change (const NotePtr note, Property prop,
+                                    uint8_t new_value)
+{
+       assert (note);
+
+       NoteChange change;
+
+       switch (prop) {
+       case NoteNumber:
+               if (new_value == note->note()) {
+                       return;
+               }
+               change.old_value = note->note();
+               break;
+       case Velocity:
+               if (new_value == note->velocity()) {
+                       return;
+               }
+               change.old_value = note->velocity();
+               break;
+       case Channel:
+               if (new_value == note->channel()) {
+                       return;
+               }
+               change.old_value = note->channel();
+               break;
+
+
+       case StartTime:
+               fatal << "MidiModel::DiffCommand::change() with integer argument called for start time" << endmsg;
+               /*NOTREACHED*/
+               break;
+       case Length:
+               fatal << "MidiModel::DiffCommand::change() with integer argument called for length" << endmsg;
+               /*NOTREACHED*/
+               break;
+       }
+
+       change.note = note;
+       change.property = prop;
+       change.new_value = new_value;
+
+       _changes.push_back (change);
+}
+
+void
+MidiModel::NoteDiffCommand::change (const NotePtr note, Property prop,
+                                    TimeType new_time)
+{
+       assert (note);
+
+       NoteChange change;
+
+       switch (prop) {
+       case NoteNumber:
+       case Channel:
+       case Velocity:
+               fatal << "MidiModel::NoteDiffCommand::change() with time argument called for note, channel or velocity" << endmsg;
+               break;
+
+       case StartTime:
+               if (Evoral::musical_time_equal (note->time(), new_time)) {
+                       return;
+               }
+               change.old_time = note->time();
+               break;
+       case Length:
+               if (Evoral::musical_time_equal (note->length(), new_time)) {
+                       return;
+               }
+               change.old_time = note->length();
+               break;
+       }
+
+       change.note = note;
+       change.property = prop;
+       change.new_time = new_time;
+
+       _changes.push_back (change);
+}
+
+MidiModel::NoteDiffCommand &
+MidiModel::NoteDiffCommand::operator+= (const NoteDiffCommand& other)
+{
+       if (this == &other) {
+               return *this;
+       }
+
+       if (_model != other._model) {
+               return *this;
+       }
+
+       _added_notes.insert (_added_notes.end(), other._added_notes.begin(), other._added_notes.end());
+       _removed_notes.insert (_removed_notes.end(), other._removed_notes.begin(), other._removed_notes.end());
+       side_effect_removals.insert (other.side_effect_removals.begin(), other.side_effect_removals.end());
+       _changes.insert (_changes.end(), other._changes.begin(), other._changes.end());
+
+       return *this;
+}
+
+void
+MidiModel::NoteDiffCommand::operator() ()
+{
+       {
+               MidiModel::WriteLock lock(_model->edit_lock());
+
+               for (NoteList::iterator i = _added_notes.begin(); i != _added_notes.end(); ++i) {
+                       if (!_model->add_note_unlocked(*i)) {
+                               /* failed to add it, so don't leave it in the removed list, to
+                                  avoid apparent errors on undo.
+                               */
+                               _removed_notes.remove (*i);
+                       }
+               }
+
+               for (NoteList::iterator i = _removed_notes.begin(); i != _removed_notes.end(); ++i) {
+                       _model->remove_note_unlocked(*i);
+               }
+
+               /* notes we modify in a way that requires remove-then-add to maintain ordering */
+               set<NotePtr> temporary_removals;
+
+               for (ChangeList::iterator i = _changes.begin(); i != _changes.end(); ++i) {
+                       Property prop = i->property;
+                       switch (prop) {
+                       case NoteNumber:
+                               if (temporary_removals.find (i->note) == temporary_removals.end()) {
+                                       _model->remove_note_unlocked (i->note);
+                                       temporary_removals.insert (i->note);
+                               }
+                               i->note->set_note (i->new_value);
+                               break;
+
+                       case StartTime:
+                               if (temporary_removals.find (i->note) == temporary_removals.end()) {
+                                       _model->remove_note_unlocked (i->note);
+                                       temporary_removals.insert (i->note);
+                               }
+                               i->note->set_time (i->new_time);
+                               break;
+
+                       case Channel:
+                               if (temporary_removals.find (i->note) == temporary_removals.end()) {
+                                       _model->remove_note_unlocked (i->note);
+                                       temporary_removals.insert (i->note);
+                               }
+                               i->note->set_channel (i->new_value);
+                               break;
+
+                               /* no remove-then-add required for these properties, since we do not index them
+                                */
+
+                       case Velocity:
+                               i->note->set_velocity (i->new_value);
+                               break;
+
+                       case Length:
+                               i->note->set_length (i->new_time);
+                               break;
+
+                       }
+               }
+
+               for (set<NotePtr>::iterator i = temporary_removals.begin(); i != temporary_removals.end(); ++i) {
+                       NoteDiffCommand side_effects (model(), "side effects");
+                       if (_model->add_note_unlocked (*i, &side_effects)) {
+                               /* The note was re-added ok */
+                               *this += side_effects;
+                       } else {
+                               /* The note that we removed earlier could not be re-added.  This change record
+                                  must say that the note was removed.  We'll keep the changes we made, though,
+                                  as if the note is re-added by the undo the changes must also be undone.
+                               */
+                               _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) {
+                               cerr << "\t" << *i << ' ' << **i << endl;
+                       }
+               }
+       }
+
+       _model->ContentsChanged(); /* EMIT SIGNAL */
+}
+
+void
+MidiModel::NoteDiffCommand::undo ()
+{
+       {
+               MidiModel::WriteLock lock(_model->edit_lock());
+
+               for (NoteList::iterator i = _added_notes.begin(); i != _added_notes.end(); ++i) {
+                       _model->remove_note_unlocked(*i);
+               }
+
+               /* Apply changes first; this is important in the case of a note change which
+                  resulted in the note being removed by the overlap checker.  If the overlap
+                  checker removes a note, it will be in _removed_notes.  We are going to re-add
+                  it below, but first we must undo the changes we made so that the overlap
+                  checker doesn't refuse the re-add.
+               */
+
+               /* notes we modify in a way that requires remove-then-add to maintain ordering */
+               set<NotePtr> temporary_removals;
+
+               for (ChangeList::iterator i = _changes.begin(); i != _changes.end(); ++i) {
+                       Property prop = i->property;
+                       switch (prop) {
+
+                       case NoteNumber:
+                               if (
+                                       temporary_removals.find (i->note) == temporary_removals.end() &&
+                                       find (_removed_notes.begin(), _removed_notes.end(), i->note) == _removed_notes.end()
+                                       ) {
+
+                                       /* We only need to mark this note for re-add if (a) we haven't
+                                          already marked it and (b) it isn't on the _removed_notes
+                                          list (which means that it has already been removed and it
+                                          will be re-added anyway)
+                                       */
+
+                                       _model->remove_note_unlocked (i->note);
+                                       temporary_removals.insert (i->note);
+                               }
+                               i->note->set_note (i->old_value);
+                               break;
+
+                       case StartTime:
+                               if (
+                                       temporary_removals.find (i->note) == temporary_removals.end() &&
+                                       find (_removed_notes.begin(), _removed_notes.end(), i->note) == _removed_notes.end()
+                                       ) {
+
+                                       /* See above ... */
+
+                                       _model->remove_note_unlocked (i->note);
+                                       temporary_removals.insert (i->note);
+                               }
+                               i->note->set_time (i->old_time);
+                               break;
+
+                       case Channel:
+                               if (
+                                       temporary_removals.find (i->note) == temporary_removals.end() &&
+                                       find (_removed_notes.begin(), _removed_notes.end(), i->note) == _removed_notes.end()
+                                       ) {
+
+                                       /* See above ... */
+
+                                       _model->remove_note_unlocked (i->note);
+                                       temporary_removals.insert (i->note);
+                               }
+                               i->note->set_channel (i->old_value);
+                               break;
+
+                               /* no remove-then-add required for these properties, since we do not index them
+                                */
+
+                       case Velocity:
+                               i->note->set_velocity (i->old_value);
+                               break;
+
+                       case Length:
+                               i->note->set_length (i->old_time);
+                               break;
+                       }
+               }
+
+               for (NoteList::iterator i = _removed_notes.begin(); i != _removed_notes.end(); ++i) {
+                       _model->add_note_unlocked(*i);
+               }
+
+               for (set<NotePtr>::iterator i = temporary_removals.begin(); i != temporary_removals.end(); ++i) {
+                       _model->add_note_unlocked (*i);
+               }
+
+               /* finally add back notes that were removed by the "do". we don't care
+                  about side effects here since the model should be back to its original
+                  state once this is done.
+               */
+
+               for (set<NotePtr>::iterator i = side_effect_removals.begin(); i != side_effect_removals.end(); ++i) {
+                       _model->add_note_unlocked (*i);
+               }
+       }
+
+       _model->ContentsChanged(); /* EMIT SIGNAL */
+}
+
+XMLNode&
+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());
+       }
+
+       return *xml_note;
+}
+
+Evoral::Sequence<MidiModel::TimeType>::NotePtr
+MidiModel::NoteDiffCommand::unmarshal_note (XMLNode *xml_note)
+{
+       unsigned int note;
+       XMLProperty* prop;
+       unsigned int channel;
+       unsigned int time;
+       unsigned int length;
+       unsigned int velocity;
+       gint id;
+
+       if ((prop = xml_note->property("id")) != 0) {
+               istringstream id_str(prop->value());
+               id_str >> id;
+       } else {
+               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 {
+               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 {
+               warning << "note information missing channel" << endmsg;
+               channel = 0;
+       }
+
+       if ((prop = xml_note->property("time")) != 0) {
+               istringstream time_str(prop->value());
+               time_str >> time;
+       } else {
+               warning << "note information missing time" << endmsg;
+               time = 0;
+       }
+
+       if ((prop = xml_note->property("length")) != 0) {
+               istringstream length_str(prop->value());
+               length_str >> length;
+       } else {
+               warning << "note information missing length" << endmsg;
+               length = 1;
+       }
+
+       if ((prop = xml_note->property("velocity")) != 0) {
+               istringstream velocity_str(prop->value());
+               velocity_str >> velocity;
+       } else {
+               warning << "note information missing velocity" << endmsg;
+               velocity = 127;
+       }
+
+       NotePtr note_ptr(new Evoral::Note<TimeType>(channel, time, length, note, velocity));
+       note_ptr->set_id (id);
+
+       return note_ptr;
+}
+
+XMLNode&
+MidiModel::NoteDiffCommand::marshal_change (const NoteChange& change)
+{
+       XMLNode* xml_change = new XMLNode("Change");
+
+       /* first, the change itself */
+
+       xml_change->add_property ("property", enum_2_string (change.property));
+
+       {
+               ostringstream old_value_str (ios::ate);
+               if (change.property == StartTime || change.property == Length) {
+                       old_value_str << change.old_time;
+               } else {
+                       old_value_str << (unsigned int) change.old_value;
+               }
+               xml_change->add_property ("old", old_value_str.str());
+       }
+
+       {
+               ostringstream new_value_str (ios::ate);
+               if (change.property == StartTime || change.property == Length) {
+                       new_value_str << change.new_time;
+               } else {
+                       new_value_str << (unsigned int) change.new_value;
+               }
+               xml_change->add_property ("new", new_value_str.str());
+       }
+
+       ostringstream id_str;
+       id_str << change.note->id();
+       xml_change->add_property ("id", id_str.str());
+
+       return *xml_change;
+}
+
+MidiModel::NoteDiffCommand::NoteChange
+MidiModel::NoteDiffCommand::unmarshal_change (XMLNode *xml_change)
+{
+       XMLProperty* prop;
+       NoteChange change;
+
+       if ((prop = xml_change->property("property")) != 0) {
+               change.property = (Property) string_2_enum (prop->value(), change.property);
+       } else {
+               fatal << "!!!" << endmsg;
+               /*NOTREACHED*/
+       }
+
+       if ((prop = xml_change->property ("id")) == 0) {
+               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) {
+                       old_str >> change.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;
+               }
+       } else {
+               fatal << "!!!" << endmsg;
+               /*NOTREACHED*/
+       }
+
+       if ((prop = xml_change->property ("new")) != 0) {
+               istringstream new_str (prop->value());
+               if (change.property == StartTime || change.property == Length) {
+                       new_str >> change.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;
+               }
+       } else {
+               fatal << "!!!" << endmsg;
+               /*NOTREACHED*/
+       }
+
+       /* we must point at the instance of the note that is actually in the model.
+          so go look for it ...
+       */
+
+       change.note = _model->find_note (note_id);
+
+       if (!change.note) {
+               warning << "MIDI note #" << note_id << " not found in model - programmers should investigate this" << endmsg;
+               return change;
+       }
+
+       return change;
+}
+
+int
+MidiModel::NoteDiffCommand::set_state (const XMLNode& diff_command, int /*version*/)
+{
+       if (diff_command.name() != string (NOTE_DIFF_COMMAND_ELEMENT)) {
+               return 1;
+       }
+
+       /* additions */
+
+       _added_notes.clear();
+       XMLNode* added_notes = diff_command.child(ADDED_NOTES_ELEMENT);
+       if (added_notes) {
+               XMLNodeList notes = added_notes->children();
+               transform(notes.begin(), notes.end(), back_inserter(_added_notes),
+                         boost::bind (&NoteDiffCommand::unmarshal_note, this, _1));
+       }
+
+
+       /* removals */
+
+       _removed_notes.clear();
+       XMLNode* removed_notes = diff_command.child(REMOVED_NOTES_ELEMENT);
+       if (removed_notes) {
+               XMLNodeList notes = removed_notes->children();
+               transform(notes.begin(), notes.end(), back_inserter(_removed_notes),
+                         boost::bind (&NoteDiffCommand::unmarshal_note, this, _1));
+       }
+
+
+       /* changes */
+
+       _changes.clear();
+
+       XMLNode* changed_notes = diff_command.child(DIFF_NOTES_ELEMENT);
+
+       if (changed_notes) {
+               XMLNodeList notes = changed_notes->children();
+               transform (notes.begin(), notes.end(), back_inserter(_changes),
+                          boost::bind (&NoteDiffCommand::unmarshal_change, this, _1));
+
+       }
+
+       /* side effect removals caused by changes */
+
+       side_effect_removals.clear();
+
+       XMLNode* side_effect_notes = diff_command.child(SIDE_EFFECT_REMOVALS_ELEMENT);
+
+       if (side_effect_notes) {
+               XMLNodeList notes = side_effect_notes->children();
+               for (XMLNodeList::iterator n = notes.begin(); n != notes.end(); ++n) {
+                       side_effect_removals.insert (unmarshal_note (*n));
+               }
+       }
+
+       return 0;
+}
+
+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());
+
+       XMLNode* changes = diff_command->add_child(DIFF_NOTES_ELEMENT);
+       for_each(_changes.begin(), _changes.end(),
+                boost::bind (
+                        boost::bind (&XMLNode::add_child_nocopy, changes, _1),
+                        boost::bind (&NoteDiffCommand::marshal_change, this, _1)));
+
+       XMLNode* added_notes = diff_command->add_child(ADDED_NOTES_ELEMENT);
+       for_each(_added_notes.begin(), _added_notes.end(),
+                boost::bind(
+                        boost::bind (&XMLNode::add_child_nocopy, added_notes, _1),
+                        boost::bind (&NoteDiffCommand::marshal_note, this, _1)));
+
+       XMLNode* removed_notes = diff_command->add_child(REMOVED_NOTES_ELEMENT);
+       for_each(_removed_notes.begin(), _removed_notes.end(),
+                boost::bind (
+                        boost::bind (&XMLNode::add_child_nocopy, removed_notes, _1),
+                        boost::bind (&NoteDiffCommand::marshal_note, this, _1)));
+
+       /* if this command had side-effects, store that state too
+        */
+
+       if (!side_effect_removals.empty()) {
+               XMLNode* side_effect_notes = diff_command->add_child(SIDE_EFFECT_REMOVALS_ELEMENT);
+               for_each(side_effect_removals.begin(), side_effect_removals.end(),
+                        boost::bind (
+                                boost::bind (&XMLNode::add_child_nocopy, side_effect_notes, _1),
+                                boost::bind (&NoteDiffCommand::marshal_note, this, _1)));
+       }
+
+       return *diff_command;
+}
+
+MidiModel::SysExDiffCommand::SysExDiffCommand (boost::shared_ptr<MidiModel> m, const XMLNode& node)
+       : DiffCommand (m, "")
+{
+       assert (_model);
+       set_state (node, Stateful::loading_state_version);
+}
+
+void
+MidiModel::SysExDiffCommand::change (boost::shared_ptr<Evoral::Event<TimeType> > s, TimeType new_time)
+{
+       Change change;
+
+       change.sysex = s;
+       change.property = Time;
+       change.old_time = s->time ();
+       change.new_time = new_time;
+
+       _changes.push_back (change);
+}
+
+void
+MidiModel::SysExDiffCommand::operator() ()
+{
+       {
+               MidiModel::WriteLock lock (_model->edit_lock ());
+
+               for (ChangeList::iterator i = _changes.begin(); i != _changes.end(); ++i) {
+                       switch (i->property) {
+                       case Time:
+                               i->sysex->set_time (i->new_time);
+                       }
+               }
+       }
+
+       _model->ContentsChanged (); /* EMIT SIGNAL */
+}
+
+void
+MidiModel::SysExDiffCommand::undo ()
+{
+       {
+               MidiModel::WriteLock lock (_model->edit_lock ());
+
+               for (ChangeList::iterator i = _changes.begin(); i != _changes.end(); ++i) {
+                       switch (i->property) {
+                       case Time:
+                               i->sysex->set_time (i->old_time);
+                               break;
+                       }
+               }
+
+       }
+
+       _model->ContentsChanged(); /* EMIT SIGNAL */
+}
+
+XMLNode&
+MidiModel::SysExDiffCommand::marshal_change (const Change& change)
+{
+       XMLNode* xml_change = new XMLNode ("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());
+       }
 
-void MidiModel::write_lock() {
-       _lock.writer_lock();
-       _automation_lock.lock();
+       {
+               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());
+
+       return *xml_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 {
+               fatal << "!!!" << endmsg;
+               /*NOTREACHED*/
+       }
+
+       if ((prop = xml_change->property ("id")) == 0) {
+               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 {
+               fatal << "!!!" << endmsg;
+               /*NOTREACHED*/
+       }
+
+       if ((prop = xml_change->property ("new")) != 0) {
+               istringstream new_str (prop->value());
+               new_str >> change.new_time;
+       } else {
+               fatal << "!!!" << endmsg;
+               /*NOTREACHED*/
+       }
+
+       /* we must point at the instance of the sysex that is actually in the model.
+          so go look for it ...
+       */
+
+       change.sysex = _model->find_sysex (sysex_id);
+
+       if (!change.sysex) {
+               warning << "Sys-ex #" << sysex_id << " not found in model - programmers should investigate this" << endmsg;
+               return change;
+       }
+
+       return change;
+}
+
+int
+MidiModel::SysExDiffCommand::set_state (const XMLNode& diff_command, int /*version*/)
+{
+       if (diff_command.name() != string (SYSEX_DIFF_COMMAND_ELEMENT)) {
+               return 1;
+       }
+
+       /* changes */
+
+       _changes.clear();
+
+       XMLNode* changed_sysexes = diff_command.child (DIFF_SYSEXES_ELEMENT);
+
+       if (changed_sysexes) {
+               XMLNodeList sysexes = changed_sysexes->children();
+               transform (sysexes.begin(), sysexes.end(), back_inserter (_changes),
+                          boost::bind (&SysExDiffCommand::unmarshal_change, this, _1));
+
+       }
+
+       return 0;
+}
+
+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());
+
+       XMLNode* changes = diff_command->add_child(DIFF_SYSEXES_ELEMENT);
+       for_each (_changes.begin(), _changes.end(),
+                 boost::bind (
+                         boost::bind (&XMLNode::add_child_nocopy, changes, _1),
+                         boost::bind (&SysExDiffCommand::marshal_change, this, _1)));
+
+       return *diff_command;
+}
+
+MidiModel::PatchChangeDiffCommand::PatchChangeDiffCommand (boost::shared_ptr<MidiModel> m, const string& name)
+       : DiffCommand (m, name)
+{
+       assert (_model);
+}
+
+MidiModel::PatchChangeDiffCommand::PatchChangeDiffCommand (boost::shared_ptr<MidiModel> m, const XMLNode & node)
+       : DiffCommand (m, "")
+{
+       assert (_model);
+       set_state (node, Stateful::loading_state_version);
+}
+
+void
+MidiModel::PatchChangeDiffCommand::add (PatchChangePtr p)
+{
+       _added.push_back (p);
+}
+
+void
+MidiModel::PatchChangeDiffCommand::remove (PatchChangePtr p)
+{
+       _removed.push_back (p);
 }
 
-void MidiModel::write_unlock() {
-       _lock.writer_unlock();
-       _automation_lock.unlock();
-}
+void
+MidiModel::PatchChangeDiffCommand::change_time (PatchChangePtr patch, TimeType t)
+{
+       Change c;
+       c.property = Time;
+       c.patch = patch;
+       c.old_time = patch->time ();
+       c.new_time = t;
+
+       _changes.push_back (c);
+}
+
+void
+MidiModel::PatchChangeDiffCommand::change_channel (PatchChangePtr patch, uint8_t channel)
+{
+       Change c;
+       c.property = Channel;
+       c.patch = patch;
+       c.old_channel = patch->channel ();
+       c.new_channel = channel;
+
+       _changes.push_back (c);
+}
+
+void
+MidiModel::PatchChangeDiffCommand::change_program (PatchChangePtr patch, uint8_t program)
+{
+       Change c;
+       c.property = Program;
+       c.patch = patch;
+       c.old_program = patch->program ();
+       c.new_program = program;
+
+       _changes.push_back (c);
+}
+
+void
+MidiModel::PatchChangeDiffCommand::change_bank (PatchChangePtr patch, int bank)
+{
+       Change c;
+       c.property = Bank;
+       c.patch = patch;
+       c.old_bank = patch->bank ();
+       c.new_bank = bank;
+
+       _changes.push_back (c);
+}
+
+void
+MidiModel::PatchChangeDiffCommand::operator() ()
+{
+       {
+               MidiModel::WriteLock lock (_model->edit_lock ());
+
+               for (list<PatchChangePtr>::iterator i = _added.begin(); i != _added.end(); ++i) {
+                       _model->add_patch_change_unlocked (*i);
+               }
+
+               for (list<PatchChangePtr>::iterator i = _removed.begin(); i != _removed.end(); ++i) {
+                       _model->remove_patch_change_unlocked (*i);
+               }
+
+               set<PatchChangePtr> temporary_removals;
+
+               for (ChangeList::iterator i = _changes.begin(); i != _changes.end(); ++i) {
+                       switch (i->property) {
+                       case Time:
+                               if (temporary_removals.find (i->patch) == temporary_removals.end()) {
+                                       _model->remove_patch_change_unlocked (i->patch);
+                                       temporary_removals.insert (i->patch);
+                               }
+                               i->patch->set_time (i->new_time);
+                               break;
+
+                       case Channel:
+                               i->patch->set_channel (i->new_channel);
+                               break;
+
+                       case Program:
+                               i->patch->set_program (i->new_program);
+                               break;
+
+                       case Bank:
+                               i->patch->set_bank (i->new_bank);
+                               break;
+                       }
+               }
+
+               for (set<PatchChangePtr>::iterator i = temporary_removals.begin(); i != temporary_removals.end(); ++i) {
+                       _model->add_patch_change_unlocked (*i);
+               }
+       }
+
+       _model->ContentsChanged (); /* EMIT SIGNAL */
+}
+
+void
+MidiModel::PatchChangeDiffCommand::undo ()
+{
+       {
+               MidiModel::WriteLock lock (_model->edit_lock());
+
+               for (list<PatchChangePtr>::iterator i = _added.begin(); i != _added.end(); ++i) {
+                       _model->remove_patch_change_unlocked (*i);
+               }
+
+               for (list<PatchChangePtr>::iterator i = _removed.begin(); i != _removed.end(); ++i) {
+                       _model->add_patch_change_unlocked (*i);
+               }
+
+               set<PatchChangePtr> temporary_removals;
+
+               for (ChangeList::iterator i = _changes.begin(); i != _changes.end(); ++i) {
+                       switch (i->property) {
+                       case Time:
+                               if (temporary_removals.find (i->patch) == temporary_removals.end()) {
+                                       _model->remove_patch_change_unlocked (i->patch);
+                                       temporary_removals.insert (i->patch);
+                               }
+                               i->patch->set_time (i->old_time);
+                               break;
+
+                       case Channel:
+                               i->patch->set_channel (i->old_channel);
+                               break;
+
+                       case Program:
+                               i->patch->set_program (i->old_program);
+                               break;
+
+                       case Bank:
+                               i->patch->set_bank (i->old_bank);
+                               break;
+                       }
+               }
+
+               for (set<PatchChangePtr>::iterator i = temporary_removals.begin(); i != temporary_removals.end(); ++i) {
+                       _model->add_patch_change_unlocked (*i);
+               }
 
-void MidiModel::read_lock() const {
-       _lock.reader_lock();
-       /*_automation_lock.lock();*/
-}
+       }
 
-void MidiModel::read_unlock() const {
-       _lock.reader_unlock();
-       /*_automation_lock.unlock();*/
+       _model->ContentsChanged (); /* EMIT SIGNAL */
 }
 
-// Read iterator (const_iterator)
-
-MidiModel::const_iterator::const_iterator(const MidiModel& model, double t)
-       : _model(&model)
-       , _is_end( (t == DBL_MAX) || model.empty())
-       , _locked( !_is_end)
+XMLNode &
+MidiModel::PatchChangeDiffCommand::marshal_patch_change (constPatchChangePtr p)
 {
-       //cerr << "Created MIDI iterator @ " << t << " (is end: " << _is_end << ")" << endl;
+       XMLNode* n = new XMLNode ("patch-change");
 
-       if (_is_end)
-               return;
+       {
+               ostringstream s (ios::ate);
+               s << int (p->id ());
+               n->add_property ("id", s.str());
+       }
 
-       model.read_lock();
+       {
+               ostringstream s (ios::ate);
+               s << p->time ();
+               n->add_property ("time", s.str ());
+       }
 
-       _note_iter = model.notes().end();
-       // find first note which begins after t
-       for (MidiModel::Notes::const_iterator i = model.notes().begin(); i != model.notes().end(); ++i) {
-               if ((*i)->time() >= t) {
-                       _note_iter = i;
-                       break;
-               }
+       {
+               ostringstream s (ios::ate);
+               s << int (p->channel ());
+               n->add_property ("channel", s.str ());
        }
 
-       MidiControlIterator earliest_control(boost::shared_ptr<AutomationList>(), DBL_MAX, 0.0);
+       {
+               ostringstream s (ios::ate);
+               s << int (p->program ());
+               n->add_property ("program", s.str ());
+       }
 
-       _control_iters.reserve(model.controls().size());
-       for (Automatable::Controls::const_iterator i = model.controls().begin();
-                       i != model.controls().end(); ++i) {
+       {
+               ostringstream s (ios::ate);
+               s << int (p->bank ());
+               n->add_property ("bank", s.str ());
+       }
 
-               assert(
-                       i->first.type() == MidiCCAutomation ||
-                       i->first.type() == MidiPgmChangeAutomation ||
-                       i->first.type() == MidiPitchBenderAutomation ||
-                       i->first.type() == MidiChannelAftertouchAutomation);
+       return *n;
+}
 
-               double x, y;
-               bool ret = i->second->list()->rt_safe_earliest_event_unlocked(t, DBL_MAX, x, y);
-               if (!ret) {
-                       //cerr << "MIDI Iterator: CC " << i->first.id() << " (size " << i->second->list()->size()
-                       //      << ") has no events past " << t << endl;
-                       continue;
+XMLNode&
+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;
                }
 
-               assert(x >= 0);
-               assert(y >= i->first.min());
-               assert(y <= i->first.max());
-
-               const MidiControlIterator new_iter(i->second->list(), x, y);
-
-               //cerr << "MIDI Iterator: CC " << i->first.id() << " added (" << x << ", " << y << ")" << endl;
-               _control_iters.push_back(new_iter);
+               n->add_property (X_("old"), s.str ());
+       }
 
-               if (x < earliest_control.x) {
-                       earliest_control = new_iter;
-                       _control_iter = _control_iters.end();
-                       --_control_iter;
+       {
+               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;
                }
-       }
 
-       if (_note_iter != model.notes().end()) {
-               _event = MIDI::Event((*_note_iter)->on_event(), false);
-               _active_notes.push(*_note_iter);
-               //cerr << " new const iterator: size active notes: " << _active_notes.size() << " is empty: " << _active_notes.empty() << endl;
-               ++_note_iter;
+               n->add_property (X_("new"), s.str ());
        }
 
-       if (earliest_control.automation_list.get() && earliest_control.x < _event.time()) {
-               model.control_to_midi_event(_event, earliest_control);
-       } else {
-               _control_iter = _control_iters.end();
+       {
+               ostringstream s;
+               s << c.patch->id ();
+               n->add_property ("id", s.str ());
        }
 
-       if (_event.size() == 0) {
-               //cerr << "Created MIDI iterator @ " << t << " is at end." << endl;
-               _is_end = true;
-
-               // FIXME: possible race condition here....
-               if (_locked) {
-                       _model->read_unlock();
-                       _locked = false;
-               }
-       } else {
-               //printf("New MIDI Iterator = %X @ %lf\n", _event.type(), _event.time());
-       }
+       return *n;
 }
 
-MidiModel::const_iterator::~const_iterator()
+MidiModel::PatchChangePtr
+MidiModel::PatchChangeDiffCommand::unmarshal_patch_change (XMLNode* n)
 {
-       if (_locked) {
-               _model->read_unlock();
+       XMLProperty* prop;
+       Evoral::event_id_t id;
+       Evoral::MusicalTime time = 0;
+       uint8_t channel = 0;
+       uint8_t program = 0;
+       int bank = 0;
+
+       if ((prop = n->property ("id")) != 0) {
+               istringstream s (prop->value());
+               s >> id;
        }
-}
 
-const MidiModel::const_iterator& MidiModel::const_iterator::operator++()
-{
-       if (_is_end) {
-               throw std::logic_error("Attempt to iterate past end of MidiModel");
+       if ((prop = n->property ("time")) != 0) {
+               istringstream s (prop->value ());
+               s >> time;
        }
 
-       /*cerr << "const_iterator::operator++: _event type:" << hex << "0x" << int(_event.type()) 
-        << "   buffer: 0x" << int(_event.buffer()[0]) << " 0x" << int(_event.buffer()[1]) 
-        << " 0x" << int(_event.buffer()[2]) << endl;*/
-
-       if (! (_event.is_note() || _event.is_cc() || _event.is_pgm_change() || _event.is_pitch_bender() || _event.is_channel_aftertouch()) ) {
-               cerr << "FAILED event buffer: " << hex << int(_event.buffer()[0]) << int(_event.buffer()[1]) << int(_event.buffer()[2]) << endl;
+       if ((prop = n->property ("channel")) != 0) {
+               istringstream s (prop->value ());
+               s >> channel;
        }
-       assert((_event.is_note() || _event.is_cc() || _event.is_pgm_change() || _event.is_pitch_bender() || _event.is_channel_aftertouch()));
 
-       // Increment past current control event
-       if (!_event.is_note() && _control_iter != _control_iters.end() && _control_iter->automation_list.get()) {
-               double x = 0.0, y = 0.0;
-               const bool ret = _control_iter->automation_list->rt_safe_earliest_event_unlocked(
-                               _control_iter->x, DBL_MAX, x, y, false);
-               //cerr << "control_iter x:" << _control_iter->x << " y:" << _control_iter->y << endl;
+       if ((prop = n->property ("program")) != 0) {
+               istringstream s (prop->value ());
+               s >> program;
+       }
 
-               if (ret) {
-                       //cerr << "Incremented " << _control_iter->automation_list->parameter().id() << " to " << x << endl;
-                       _control_iter->x = x;
-                       _control_iter->y = y;
-               } else {
-                       cerr << "Hit end of " << _control_iter->automation_list->parameter().id() << endl;
-                       _control_iter->automation_list.reset();
-                       _control_iter->x = DBL_MAX;
-               }
+       if ((prop = n->property ("bank")) != 0) {
+               istringstream s (prop->value ());
+               s >> bank;
        }
 
-       // Now find and point at the earliest event
+       PatchChangePtr p (new Evoral::PatchChange<TimeType> (time, channel, program, bank));
+       p->set_id (id);
+       return p;
+}
 
-       const std::vector<MidiControlIterator>::iterator old_control_iter = _control_iter;
-       _control_iter = _control_iters.begin();
+MidiModel::PatchChangeDiffCommand::Change
+MidiModel::PatchChangeDiffCommand::unmarshal_change (XMLNode* n)
+{
+       XMLProperty* prop;
+       Change c;
+
+       prop = n->property ("property");
+       assert (prop);
+       c.property = (Property) string_2_enum (prop->value(), c.property);
+
+       prop = n->property ("id");
+       assert (prop);
+       Evoral::event_id_t const id = atoi (prop->value().c_str());
+
+       prop = n->property ("old");
+       assert (prop);
+       {
+               istringstream s (prop->value ());
+               if (c.property == Time) {
+                       s >> c.old_time;
+               } else if (c.property == Channel) {
+                       s >> c.old_channel;
+               } else if (c.property == Program) {
+                       s >> c.old_program;
+               } else if (c.property == Bank) {
+                       s >> c.old_bank;
+               }
+       }
 
-       for (std::vector<MidiControlIterator>::iterator i = _control_iters.begin();
-                       i != _control_iters.end(); ++i) {
-               if (i->x < _control_iter->x) {
-                       _control_iter = i;
+       prop = n->property ("new");
+       assert (prop);
+       {
+               istringstream s (prop->value ());
+               if (c.property == Time) {
+                       s >> c.new_time;
+               } else if (c.property == Channel) {
+                       s >> c.new_channel;
+               } else if (c.property == Program) {
+                       s >> c.new_program;
+               } else if (c.property == Bank) {
+                       s >> c.new_bank;
                }
        }
 
-       enum Type {NIL, NOTE_ON, NOTE_OFF, AUTOMATION};
+       c.patch = _model->find_patch_change (id);
+       assert (c.patch);
 
-       Type type = NIL;
-       double t = 0;
+       return c;
+}
 
-       // Next earliest note on
-       if (_note_iter != _model->notes().end()) {
-               type = NOTE_ON;
-               t = (*_note_iter)->time();
+int
+MidiModel::PatchChangeDiffCommand::set_state (const XMLNode& diff_command, int /*version*/)
+{
+       if (diff_command.name() != PATCH_CHANGE_DIFF_COMMAND_ELEMENT) {
+               return 1;
        }
 
-       // Use the next earliest note off iff it's earlier than the note on
-       if (_model->note_mode() == Sustained && (! _active_notes.empty())) {
-               if (type == NIL || _active_notes.top()->end_time() <= (*_note_iter)->time()) {
-                       type = NOTE_OFF;
-                       t = _active_notes.top()->end_time();
-               }
+       _added.clear ();
+       XMLNode* added = diff_command.child (ADDED_PATCH_CHANGES_ELEMENT);
+       if (added) {
+               XMLNodeList p = added->children ();
+               transform (p.begin(), p.end(), back_inserter (_added), boost::bind (&PatchChangeDiffCommand::unmarshal_patch_change, this, _1));
        }
 
-       // Use the next earliest controller iff it's earlier than the note event
-       if (_control_iter != _control_iters.end()
-                       && _control_iter->x != DBL_MAX
-          )//&& _control_iter != old_control_iter)
-               if (type == NIL || _control_iter->x < t)
-                       type = AUTOMATION;
-
-       if (type == NOTE_ON) {
-               //cerr << "********** MIDI Iterator = note on" << endl;
-               _event = MIDI::Event((*_note_iter)->on_event(), false);
-               _active_notes.push(*_note_iter);
-               ++_note_iter;
-       } else if (type == NOTE_OFF) {
-               //cerr << "********** MIDI Iterator = note off" << endl;
-               _event = MIDI::Event(_active_notes.top()->off_event(), false);
-               _active_notes.pop();
-       } else if (type == AUTOMATION) {
-               //cerr << "********** MIDI Iterator = Automation" << endl;
-               _model->control_to_midi_event(_event, *_control_iter);
-       } else {
-               //cerr << "********** MIDI Iterator = End" << endl;
-               _is_end = true;
+       _removed.clear ();
+       XMLNode* removed = diff_command.child (REMOVED_PATCH_CHANGES_ELEMENT);
+       if (removed) {
+               XMLNodeList p = removed->children ();
+               transform (p.begin(), p.end(), back_inserter (_removed), boost::bind (&PatchChangeDiffCommand::unmarshal_patch_change, this, _1));
        }
 
-       assert(_is_end || _event.size()> 0);
+       _changes.clear ();
+       XMLNode* changed = diff_command.child (DIFF_PATCH_CHANGES_ELEMENT);
+       if (changed) {
+               XMLNodeList p = changed->children ();
+               transform (p.begin(), p.end(), back_inserter (_changes), boost::bind (&PatchChangeDiffCommand::unmarshal_change, this, _1));
+       }
 
-       return *this;
+       return 0;
 }
 
-bool MidiModel::const_iterator::operator==(const const_iterator& other) const
+XMLNode &
+MidiModel::PatchChangeDiffCommand::get_state ()
 {
-       if (_is_end || other._is_end) {
-               return (_is_end == other._is_end);
-       } else {
-               return (_event == other._event);
-       }
+       XMLNode* diff_command = new XMLNode (PATCH_CHANGE_DIFF_COMMAND_ELEMENT);
+       diff_command->add_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(),
+                 boost::bind (
+                         boost::bind (&XMLNode::add_child_nocopy, added, _1),
+                         boost::bind (&PatchChangeDiffCommand::marshal_patch_change, this, _1)
+                         )
+               );
+
+       XMLNode* removed = diff_command->add_child (REMOVED_PATCH_CHANGES_ELEMENT);
+       for_each (_removed.begin(), _removed.end(),
+                 boost::bind (
+                         boost::bind (&XMLNode::add_child_nocopy, removed, _1),
+                         boost::bind (&PatchChangeDiffCommand::marshal_patch_change, this, _1)
+                         )
+               );
+
+       XMLNode* changes = diff_command->add_child (DIFF_PATCH_CHANGES_ELEMENT);
+       for_each (_changes.begin(), _changes.end(),
+                 boost::bind (
+                         boost::bind (&XMLNode::add_child_nocopy, changes, _1),
+                         boost::bind (&PatchChangeDiffCommand::marshal_change, this, _1)
+                         )
+               );
+
+       return *diff_command;
 }
 
-MidiModel::const_iterator& MidiModel::const_iterator::operator=(const const_iterator& other)
+/** Write all of the model to a MidiSource (i.e. save the model).
+ * This is different from manually using read to write to a source in that
+ * note off events are written regardless of the track mode.  This is so the
+ * user can switch a recorded track (with note durations from some instrument)
+ * to percussive, save, reload, then switch it back to sustained without
+ * destroying the original note durations.
+ *
+ * Similarly, control events are written without interpolation (as with the
+ * `Discrete' mode).
+ */
+bool
+MidiModel::write_to (boost::shared_ptr<MidiSource> source)
 {
-       if (_locked && _model != other._model)
-               _model->read_unlock();
+       ReadLock lock(read_lock());
 
-       assert( ! other._event.owns_buffer());
+       const bool old_percussive = percussive();
+       set_percussive(false);
 
-       _model = other._model;
-       _event = other._event;
-       _active_notes = other._active_notes;
-       _is_end = other._is_end;
-       _locked = other._locked;
-       _note_iter = other._note_iter;
-       _control_iters = other._control_iters;
-       size_t index = other._control_iter - other._control_iters.begin();
-       _control_iter = _control_iters.begin() + index;
+       boost::shared_ptr<MidiSource> ms = _midi_source.lock ();
+       assert (ms);
 
-       assert( !_event.owns_buffer() );
+       source->drop_model();
+       source->mark_streaming_midi_write_started (note_mode());
 
-       return *this;
-}
+       for (Evoral::Sequence<TimeType>::const_iterator i = begin(0, true); i != end(); ++i) {
+               source->append_event_unlocked_beats(*i);
+       }
 
-// MidiModel
+       set_percussive(old_percussive);
+       source->mark_streaming_write_completed();
 
-MidiModel::MidiModel(MidiSource *s, size_t size)
-       : Automatable(s->session(), "midi model")
-       , _notes(size)
-       , _note_mode(Sustained)
-       , _writing(false)
-       , _edited(false)
-       , _end_iter(*this, DBL_MAX)
-       , _next_read(UINT32_MAX)
-       , _read_iter(*this, DBL_MAX)
-       , _midi_source(s)
-{
-       assert(_end_iter._is_end);
-       assert( ! _end_iter._locked);
+       set_edited(false);
+
+       return true;
 }
 
-/** Read events in frame range \a start .. \a start+cnt into \a dst,
- * adding \a stamp_offset to each event's timestamp.
- * \return number of events written to \a dst
- */
-size_t MidiModel::read(MidiRingBuffer& dst, nframes_t start, nframes_t nframes,
-               nframes_t stamp_offset, nframes_t negative_stamp_offset) const
+/** very similar to ::write_to() but writes to the model's own
+    existing midi_source, without making it call MidiSource::drop_model().
+    the caller is a MidiSource that needs to catch up with the state
+    of the model.
+*/
+bool
+MidiModel::sync_to_source ()
 {
-       //cerr << this << " MM::read @ " << start << " frames: " << nframes << " -> " << stamp_offset << endl;
-       //cerr << this << " MM # notes: " << n_notes() << endl;
+       ReadLock lock(read_lock());
 
-       size_t read_events = 0;
+       const bool old_percussive = percussive();
+       set_percussive(false);
 
-       if (start != _next_read) {
-               _read_iter = const_iterator(*this, (double)start);
-               //cerr << "Repositioning iterator from " << _next_read << " to " << start << endl;
-       } else {
-               //cerr << "Using cached iterator at " << _next_read << endl;
-       }
+       boost::shared_ptr<MidiSource> ms = _midi_source.lock ();
+       assert (ms);
 
-       _next_read = start + nframes;
+       ms->mark_streaming_midi_write_started (note_mode());
 
-       while (_read_iter != end() && _read_iter->time() < start + nframes) {
-               assert(_read_iter->size()> 0);
-               assert(_read_iter->buffer());
-               dst.write(_read_iter->time() + stamp_offset - negative_stamp_offset,
-                               _read_iter->size(), _read_iter->buffer());
+       for (Evoral::Sequence<TimeType>::const_iterator i = begin(0, true); i != end(); ++i) {
+               ms->append_event_unlocked_beats(*i);
+       }
 
-               
-                cerr << this << " MidiModel::read event @ " << _read_iter->time()  
-                << " type: " << hex << int(_read_iter->type()) << dec 
-                //<< " note: " << int(_read_iter->note()) 
-                //<< " velocity: " << int(_read_iter->velocity()) 
-                << endl;
-                
+       set_percussive (old_percussive);
+       ms->mark_streaming_write_completed ();
 
-               ++_read_iter;
-               ++read_events;
-       }
+       set_edited (false);
 
-       return read_events;
+       return true;
 }
 
-bool MidiModel::control_to_midi_event(MIDI::Event& ev,
-               const MidiControlIterator& iter) const
+/** Write part or all of the model to a MidiSource (i.e. save the model).
+ * This is different from manually using read to write to a source in that
+ * note off events are written regardless of the track mode.  This is so the
+ * user can switch a recorded track (with note durations from some instrument)
+ * to percussive, save, reload, then switch it back to sustained without
+ * destroying the original note durations.
+ */
+bool
+MidiModel::write_section_to (boost::shared_ptr<MidiSource> source, Evoral::MusicalTime begin_time, Evoral::MusicalTime end_time)
 {
-       assert(iter.automation_list.get() != 0);
-       
-       switch (iter.automation_list->parameter().type()) {
-       case MidiCCAutomation:
-               if (ev.size() < 3) {
-                       ev.set_buffer((Byte*)malloc(3), true);
-               }
+       ReadLock lock(read_lock());
+       MidiStateTracker mst;
+       Evoral::MusicalTime extra_note_on_time = end_time;
 
-               assert(iter.automation_list);
-               assert(iter.automation_list->parameter().channel() < 16);
-               assert(iter.automation_list->parameter().id() <= INT8_MAX);
-               assert(iter.y <= INT8_MAX);
-               ev.buffer()[0] = MIDI_CMD_CONTROL + iter.automation_list->parameter().channel();
-               ev.buffer()[1] = (Byte)iter.automation_list->parameter().id();
-               ev.buffer()[2] = (Byte)iter.y;
-               ev.time() = iter.x;
-               ev.size() = 3;
-               return true;
+       const bool old_percussive = percussive();
+       set_percussive(false);
 
-       case MidiPgmChangeAutomation:
-               if (ev.size() < 2) {
-                       ev.set_buffer((Byte*)malloc(2), true);
-               }
+       boost::shared_ptr<MidiSource> ms = _midi_source.lock ();
+       assert (ms);
 
-               assert(iter.automation_list);
-               assert(iter.automation_list->parameter().channel() < 16);
-               assert(iter.automation_list->parameter().id() == 0);
-               assert(iter.y <= INT8_MAX);
-               ev.buffer()[0] = MIDI_CMD_PGM_CHANGE + iter.automation_list->parameter().channel();
-               ev.buffer()[1] = (Byte)iter.y;
-               ev.time() = iter.x;
-               ev.size() = 3;
-               return true;
+       source->drop_model();
+       source->mark_streaming_midi_write_started (note_mode());
 
-       case MidiPitchBenderAutomation:
-               if (ev.size() < 3) {
-                       ev.set_buffer((Byte*)malloc(3), true);
-               }
+       for (Evoral::Sequence<TimeType>::const_iterator i = begin(0, true); i != end(); ++i) {
+               const Evoral::Event<Evoral::MusicalTime>& ev (*i);
 
-               assert(iter.automation_list);
-               assert(iter.automation_list->parameter().channel() < 16);
-               assert(iter.automation_list->parameter().id() == 0);
-               assert(iter.y < (1<<14));
-               ev.buffer()[0] = MIDI_CMD_BENDER + iter.automation_list->parameter().channel();
-               ev.buffer()[1] = ((Byte)iter.y) & 0x7F; // LSB
-               ev.buffer()[2] = (((Byte)iter.y) >> 7) & 0x7F; // MSB
-               ev.time() = iter.x;
-               ev.size() = 3;
-               return true;
+               if (ev.time() >= begin_time && ev.time() < end_time) {
 
-       case MidiChannelAftertouchAutomation:
-               if (ev.size() < 2) {
-                       ev.set_buffer((Byte*)malloc(2), true);
-               }
+                       const Evoral::MIDIEvent<Evoral::MusicalTime>* mev =
+                               static_cast<const Evoral::MIDIEvent<Evoral::MusicalTime>* > (&ev);
 
-               assert(iter.automation_list);
-               assert(iter.automation_list->parameter().channel() < 16);
-               assert(iter.automation_list->parameter().id() == 0);
-               assert(iter.y <= INT8_MAX);
-               ev.buffer()[0]
-                               = MIDI_CMD_CHANNEL_PRESSURE + iter.automation_list->parameter().channel();
-               ev.buffer()[1] = (Byte)iter.y;
-               ev.time() = iter.x;
-               ev.size() = 3;
-               return true;
+                       if (!mev) {
+                               continue;
+                       }
 
-       default:
-               return false;
-       }
-}
 
+                       if (mev->is_note_off()) {
 
-/** Clear all events from the model.
- */
-void MidiModel::clear()
-{
-       _lock.writer_lock();
-       _notes.clear();
-       clear_automation();
-       _next_read = 0;
-       _read_iter = end();
-       _lock.writer_unlock();
-}
+                               if (!mst.active (mev->note(), mev->channel())) {
 
+                                       /* add a note-on at the start of the range we're writing
+                                          to the file. velocity is just an arbitary reasonable value.
+                                       */
 
-/** Begin a write of events to the model.
- *
- * If \a mode is Sustained, complete notes with duration are constructed as note
- * on/off events are received.  Otherwise (Percussive), only note on events are
- * stored; note off events are discarded entirely and all contained notes will
- * have duration 0.
- */
-void MidiModel::start_write()
-{
-       //cerr << "MM " << this << " START WRITE, MODE = " << enum_2_string(_note_mode) << endl;
-       write_lock();
-       _writing = true;
-       for (int i = 0; i < 16; ++i)
-               _write_notes[i].clear();
-       
-       _dirty_automations.clear();
-       write_unlock();
-}
+                                       Evoral::MIDIEvent<Evoral::MusicalTime> on (mev->event_type(), extra_note_on_time, 3, 0, true);
+                                       on.set_type (mev->type());
+                                       on.set_note (mev->note());
+                                       on.set_channel (mev->channel());
+                                       on.set_velocity (mev->velocity());
 
-/** Finish a write of events to the model.
- *
- * If \a delete_stuck is true and the current mode is Sustained, note on events
- * that were never resolved with a corresonding note off will be deleted.
- * Otherwise they will remain as notes with duration 0.
- */
-void MidiModel::end_write(bool delete_stuck)
-{
-       write_lock();
-       assert(_writing);
+                                       cerr << "Add note on for odd note off, note = " << (int) on.note() << endl;
+                                       source->append_event_unlocked_beats (on);
+                                       mst.add (on.note(), on.channel());
+                                       mst.dump (cerr);
+                                       extra_note_on_time += 1.0/128.0;
+                               }
 
-       //cerr << "MM " << this << " END WRITE: " << _notes.size() << " NOTES\n";
+                               cerr << "MIDI Note off (note = " << (int) mev->note() << endl;
+                               source->append_event_unlocked_beats (*i);
+                               mst.remove (mev->note(), mev->channel());
+                               mst.dump (cerr);
 
-       if (_note_mode == Sustained && delete_stuck) {
-               for (Notes::iterator n = _notes.begin(); n != _notes.end() ;) {
-                       if ((*n)->duration() == 0) {
-                               cerr << "WARNING: Stuck note lost: " << (*n)->note() << endl;
-                               n = _notes.erase(n);
-                               // we have to break here because erase invalidates the iterator
-                               break;
+                       } else if (mev->is_note_on()) {
+                               cerr << "MIDI Note on (note = " << (int) mev->note() << endl;
+                               mst.add (mev->note(), mev->channel());
+                               source->append_event_unlocked_beats(*i);
+                               mst.dump (cerr);
                        } else {
-                               ++n;
+                               cerr << "MIDI other event type\n";
+                               source->append_event_unlocked_beats(*i);
                        }
                }
        }
 
-       for (int i = 0; i < 16; ++i) {
-               if (!_write_notes[i].empty()) {
-                       cerr << "WARNING: MidiModel::end_write: Channel " << i << " has "
-                                       << _write_notes[i].size() << " stuck notes" << endl;
-               }
-               _write_notes[i].clear();
-       }
+       mst.resolve_notes (*source, end_time);
 
-       for (AutomationLists::const_iterator i = _dirty_automations.begin(); i != _dirty_automations.end(); ++i) {
-               (*i)->Dirty.emit();
-               (*i)->lookup_cache().left = -1;
-               (*i)->search_cache().left = -1;
-       }
-       
-       _writing = false;
-       write_unlock();
-}
+       set_percussive(old_percussive);
+       source->mark_streaming_write_completed();
 
-/** Append \a in_event to model.  NOT realtime safe.
- *
- * Timestamps of events in \a buf are expected to be relative to
- * the start of this model (t=0) and MUST be monotonically increasing
- * and MUST be >= the latest event currently in the model.
- */
-void MidiModel::append(const MIDI::Event& ev)
-{
-       write_lock();
-       _edited = true;
-
-       cerr << "MidiModel append event type: "
-               << hex << "0x" << (int)ev.type() << endl;
-
-       assert(_notes.empty() || ev.time() >= _notes.back()->time());
-       assert(_writing);
-
-       if (ev.is_note_on()) {
-               append_note_on_unlocked(ev.channel(), ev.time(), ev.note(),
-                               ev.velocity());
-       } else if (ev.is_note_off()) {
-               append_note_off_unlocked(ev.channel(), ev.time(), ev.note());
-       } else if (ev.is_cc()) {
-               append_automation_event_unlocked(MidiCCAutomation, ev.channel(),
-                               ev.time(), ev.cc_number(), ev.cc_value());
-       } else if (ev.is_pgm_change()) {
-               append_automation_event_unlocked(MidiPgmChangeAutomation, ev.channel(),
-                               ev.time(), ev.pgm_number(), 0);
-       } else if (ev.is_pitch_bender()) {
-               append_automation_event_unlocked(MidiPitchBenderAutomation,
-                               ev.channel(), ev.time(), ev.pitch_bender_lsb(),
-                               ev.pitch_bender_msb());
-       } else if (ev.is_channel_aftertouch()) {
-               append_automation_event_unlocked(MidiChannelAftertouchAutomation,
-                               ev.channel(), ev.time(), ev.channel_aftertouch(), 0);
-       } else {
-               printf("WARNING: MidiModel: Unknown event type %X\n", ev.type());
-       }
+       set_edited(false);
 
-       write_unlock();
+       return true;
 }
 
-void MidiModel::append_note_on_unlocked(uint8_t chan, double time,
-               uint8_t note_num, uint8_t velocity)
+XMLNode&
+MidiModel::get_state()
 {
-       /*cerr << "MidiModel " << this << " chan " << (int)chan <<
-        " note " << (int)note_num << " on @ " << time << endl;*/
-
-       assert(chan < 16);
-       assert(_writing);
-       _edited = true;
-
-       boost::shared_ptr<Note> new_note(new Note(chan, time, 0, note_num, velocity));
-       _notes.push_back(new_note);
-       if (_note_mode == Sustained) {
-               //cerr << "MM Sustained: Appending active note on " << (unsigned)(uint8_t)note_num << endl;
-               _write_notes[chan].push_back(_notes.size() - 1);
-       }/* else {
-        cerr << "MM Percussive: NOT appending active note on" << endl;
-        }*/
+       XMLNode *node = new XMLNode("MidiModel");
+       return *node;
 }
 
-void MidiModel::append_note_off_unlocked(uint8_t chan, double time,
-               uint8_t note_num)
+Evoral::Sequence<MidiModel::TimeType>::NotePtr
+MidiModel::find_note (NotePtr other)
 {
-       /*cerr << "MidiModel " << this << " chan " << (int)chan <<
-        " note " << (int)note_num << " off @ " << time << endl;*/
-
-       assert(chan < 16);
-       assert(_writing);
-       _edited = true;
-
-       if (_note_mode == Percussive) {
-               cerr << "MidiModel Ignoring note off (percussive mode)" << endl;
-               return;
+       Notes::iterator l = notes().lower_bound(other);
+
+       if (l != notes().end()) {
+               for (; (*l)->time() == other->time(); ++l) {
+                       /* NB: compare note contents, not note pointers.
+                          If "other" was a ptr to a note already in
+                          the model, we wouldn't be looking for it,
+                          would we now?
+                       */
+                       if (**l == *other) {
+                               return *l;
+                       }
+               }
        }
 
-       /* FIXME: make _write_notes fixed size (127 noted) for speed */
-
-       /* FIXME: note off velocity for that one guy out there who actually has
-        * keys that send it */
+       return NotePtr();
+}
 
-       bool resolved = false;
+Evoral::Sequence<MidiModel::TimeType>::NotePtr
+MidiModel::find_note (gint note_id)
+{
+       /* used only for looking up notes when reloading history from disk,
+          so we don't care about performance *too* much.
+       */
 
-       for (WriteNotes::iterator n = _write_notes[chan].begin(); n
-                       != _write_notes[chan].end(); ++n) {
-               Note& note = *_notes[*n].get();
-               //cerr << (unsigned)(uint8_t)note.note() << " ? " << (unsigned)note_num << endl;
-               if (note.note() == note_num) {
-                       assert(time >= note.time());
-                       note.set_duration(time - note.time());
-                       _write_notes[chan].erase(n);
-                       //cerr << "MM resolved note, duration: " << note.duration() << endl;
-                       resolved = true;
-                       break;
+       for (Notes::iterator l = notes().begin(); l != notes().end(); ++l) {
+               if ((*l)->id() == note_id) {
+                       return *l;
                }
        }
 
-       if (!resolved) {
-               cerr << "MidiModel " << this << " spurious note off chan " << (int)chan
-                               << ", note " << (int)note_num << " @ " << time << endl;
-       }
+       return NotePtr();
 }
 
-void MidiModel::append_automation_event_unlocked(AutomationType type,
-               uint8_t chan, double time, uint8_t first_byte, uint8_t second_byte)
+MidiModel::PatchChangePtr
+MidiModel::find_patch_change (Evoral::event_id_t id)
 {
-       //cerr << "MidiModel " << this << " chan " << (int)chan <<
-       //              " CC " << (int)number << " = " << (int)value << " @ " << time << endl;
+       for (PatchChanges::iterator i = patch_changes().begin(); i != patch_changes().end(); ++i) {
+               if ((*i)->id() == id) {
+                       return *i;
+               }
+       }
 
-       assert(chan < 16);
-       assert(_writing);
-       _edited = true;
-       double value;
+       return PatchChangePtr ();
+}
 
-       uint32_t id = 0;
+boost::shared_ptr<Evoral::Event<MidiModel::TimeType> >
+MidiModel::find_sysex (gint sysex_id)
+{
+       /* used only for looking up notes when reloading history from disk,
+          so we don't care about performance *too* much.
+       */
 
-       switch (type) {
-       case MidiCCAutomation:
-               id = first_byte;
-               value = double(second_byte);
-               break;
-       case MidiChannelAftertouchAutomation:
-       case MidiPgmChangeAutomation:
-               id = 0;
-               value = double(first_byte);
-               break;
-       case MidiPitchBenderAutomation:
-               id = 0;
-               value = double((0x7F & second_byte) << 7 | (0x7F & first_byte));
-               break;
-       default:
-               assert(false);
-       }
-
-       Parameter param(type, id, chan);
-       boost::shared_ptr<AutomationControl> control = Automatable::control(param, true);
-       control->list()->rt_add(time, value);
-       /*cerr << "control list size after fast simple add: " << control->list()->size() << endl;*/
-}
-
-void MidiModel::add_note_unlocked(const boost::shared_ptr<Note> note)
-{
-       //cerr << "MidiModel " << this << " add note " << (int)note.note() << " @ " << note.time() << endl;
-       _edited = true;
-       Notes::iterator i = upper_bound(_notes.begin(), _notes.end(), note,
-                       note_time_comparator);
-       _notes.insert(i, note);
-}
-
-void MidiModel::remove_note_unlocked(const boost::shared_ptr<const Note> note)
-{
-       _edited = true;
-       //cerr << "MidiModel " << this << " remove note " << (int)note.note() << " @ " << note.time() << endl;
-       for (Notes::iterator n = _notes.begin(); n != _notes.end(); ++n) {
-               Note& _n = *(*n);
-               const Note& _note = *note;
-               // TODO: There is still the issue, that after restarting ardour
-               // persisted undo does not work, because of rounding errors in the
-               // event times after saving/restoring to/from MIDI files
-               cerr << "======================================= " << endl;
-               cerr << int(_n.note()) << "@" << int(_n.time()) << "[" << int(_n.channel()) << "] --" << int(_n.duration()) << "-- #" << int(_n.velocity()) << endl;
-               cerr << int(_note.note()) << "@" << int(_note.time()) << "[" << int(_note.channel()) << "] --" << int(_note.duration()) << "-- #" << int(_note.velocity()) << endl;
-               cerr << "Equal: " << bool(_n == _note) << endl;
-               cerr << endl << endl;
-               if (_n == _note) {
-                       _notes.erase(n);
-                       // we have to break here, because erase invalidates all iterators, ie. n itself
-                       break;
+       for (SysExes::iterator l = sysexes().begin(); l != sysexes().end(); ++l) {
+               if ((*l)->id() == sysex_id) {
+                       return *l;
                }
        }
-}
-
-/** Slow!  for debugging only. */
-#ifndef NDEBUG
-bool MidiModel::is_sorted() const {
-       bool t = 0;
-       for (Notes::const_iterator n = _notes.begin(); n != _notes.end(); ++n)
-               if ((*n)->time() < t)
-                       return false;
-               else
-                       t = (*n)->time();
 
-       return true;
+       return boost::shared_ptr<Evoral::Event<TimeType> > ();
 }
-#endif
 
-/** Start a new command.
- *
- * This has no side-effects on the model or Session, the returned command
- * can be held on to for as long as the caller wishes, or discarded without
- * formality, until apply_command is called and ownership is taken.
+/** Lock and invalidate the source.
+ * This should be used by commands and editing things
  */
-MidiModel::DeltaCommand* MidiModel::new_delta_command(const string name)
+MidiModel::WriteLock
+MidiModel::edit_lock()
 {
-       DeltaCommand* cmd = new DeltaCommand(_midi_source->model(), name);
-       return cmd;
+       boost::shared_ptr<MidiSource> ms = _midi_source.lock ();
+       assert (ms);
+
+       Glib::Mutex::Lock* source_lock = new Glib::Mutex::Lock (ms->mutex());
+       ms->invalidate(); // Release cached iterator's read lock on model
+       return WriteLock(new WriteLockImpl(source_lock, _lock, _control_lock));
 }
 
-/** Apply a command.
- *
- * Ownership of cmd is taken, it must not be deleted by the caller.
- * The command will constitute one item on the undo stack.
+/** Lock just the model, the source lock must already be held.
+ * This should only be called from libardour/evoral places
  */
-void MidiModel::apply_command(Command* cmd)
+MidiModel::WriteLock
+MidiModel::write_lock()
 {
-       _session.begin_reversible_command(cmd->name());
-       (*cmd)();
-       assert(is_sorted());
-       _session.commit_reversible_command(cmd);
-       _edited = true;
-}
+       boost::shared_ptr<MidiSource> ms = _midi_source.lock ();
+       assert (ms);
 
-// MidiEditCommand
-
-MidiModel::DeltaCommand::DeltaCommand(boost::shared_ptr<MidiModel> m,
-               const std::string& name)
-       : Command(name)
-       , _model(m)
-       , _name(name)
-{
+       assert (!ms->mutex().trylock ());
+       return WriteLock(new WriteLockImpl(NULL, _lock, _control_lock));
 }
 
-MidiModel::DeltaCommand::DeltaCommand(boost::shared_ptr<MidiModel> m,
-               const XMLNode& node)
-       : _model(m)
+int
+MidiModel::resolve_overlaps_unlocked (const NotePtr note, void* arg)
 {
-       set_state(node);
-}
+       using namespace Evoral;
 
-void MidiModel::DeltaCommand::add(const boost::shared_ptr<Note> note)
-{
-       //cerr << "MEC: apply" << endl;
-       _removed_notes.remove(note);
-       _added_notes.push_back(note);
-}
+       if (_writing || insert_merge_policy() == InsertMergeRelax) {
+               return 0;
+       }
 
-void MidiModel::DeltaCommand::remove(const boost::shared_ptr<Note> note)
-{
-       //cerr << "MEC: remove" << endl;
-       _added_notes.remove(note);
-       _removed_notes.push_back(note);
-}
+       NoteDiffCommand* cmd = static_cast<NoteDiffCommand*>(arg);
 
-void MidiModel::DeltaCommand::operator()()
-{
-       // This could be made much faster by using a priority_queue for added and
-       // removed notes (or sort here), and doing a single iteration over _model
+       TimeType sa = note->time();
+       TimeType ea  = note->end_time();
 
-       // Need to reset iterator to drop the read lock it holds, or we'll deadlock
-       const bool reset_iter = (_model->_read_iter.locked());
-       const double iter_time = _model->_read_iter->time();
+       const Pitches& p (pitches (note->channel()));
+       NotePtr search_note(new Note<TimeType>(0, 0, 0, note->note()));
+       set<NotePtr> to_be_deleted;
+       bool set_note_length = false;
+       bool set_note_time = false;
+       TimeType note_time = note->time();
+       TimeType note_length = note->length();
 
-       if (reset_iter)
-               _model->_read_iter = _model->end(); // drop read lock
+       DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1 checking overlaps for note %2 @ %3\n", this, (int)note->note(), note->time()));
 
-       assert( ! _model->_read_iter.locked());
+       for (Pitches::const_iterator i = p.lower_bound (search_note);
+            i != p.end() && (*i)->note() == note->note(); ++i) {
 
-       _model->write_lock();
+               TimeType sb = (*i)->time();
+               TimeType eb = (*i)->end_time();
+               OverlapType overlap = OverlapNone;
 
-       for (std::list< boost::shared_ptr<Note> >::iterator i = _added_notes.begin(); i != _added_notes.end(); ++i)
-               _model->add_note_unlocked(*i);
+               if ((sb > sa) && (eb <= ea)) {
+                       overlap = OverlapInternal;
+               } else if ((eb >= sa) && (eb <= ea)) {
+                       overlap = OverlapStart;
+               } else if ((sb > sa) && (sb <= ea)) {
+                       overlap = OverlapEnd;
+               } else if ((sa >= sb) && (sa <= eb) && (ea <= eb)) {
+                       overlap = OverlapExternal;
+               } else {
+                       /* no overlap */
+                       continue;
+               }
 
-       for (std::list< boost::shared_ptr<Note> >::iterator i = _removed_notes.begin(); i != _removed_notes.end(); ++i)
-               _model->remove_note_unlocked(*i);
+               DEBUG_TRACE (DEBUG::Sequence, string_compose (
+                                    "\toverlap is %1 for (%2,%3) vs (%4,%5)\n",
+                                    enum_2_string(overlap), sa, ea, sb, eb));
 
-       _model->write_unlock();
+               if (insert_merge_policy() == InsertMergeReject) {
+                       DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1 just reject\n", this));
+                       return -1;
+               }
 
-       if (reset_iter)
-       _model->_read_iter = const_iterator(*_model.get(), iter_time);
+               switch (overlap) {
+               case OverlapStart:
+                       cerr << "OverlapStart\n";
+                       /* existing note covers start of new note */
+                       switch (insert_merge_policy()) {
+                       case InsertMergeReplace:
+                               to_be_deleted.insert (*i);
+                               break;
+                       case InsertMergeTruncateExisting:
+                               if (cmd) {
+                                       cmd->change (*i, NoteDiffCommand::Length, (note->time() - (*i)->time()));
+                               }
+                               (*i)->set_length (note->time() - (*i)->time());
+                               break;
+                       case InsertMergeTruncateAddition:
+                               set_note_time = true;
+                               set_note_length = true;
+                               note_time = (*i)->time() + (*i)->length();
+                               note_length = min (note_length, (*i)->length() - ((*i)->end_time() - note->time()));
+                               break;
+                       case InsertMergeExtend:
+                               if (cmd) {
+                                       cmd->change ((*i), NoteDiffCommand::Length, note->end_time() - (*i)->time());
+                               }
+                               (*i)->set_length (note->end_time() - (*i)->time());
+                               return -1; /* do not add the new note */
+                               break;
+                       default:
+                               /*NOTREACHED*/
+                               /* stupid gcc */
+                               break;
+                       }
+                       break;
 
-       _model->ContentsChanged(); /* EMIT SIGNAL */
-}
+               case OverlapEnd:
+                       cerr << "OverlapEnd\n";
+                       /* existing note covers end of new note */
+                       switch (insert_merge_policy()) {
+                       case InsertMergeReplace:
+                               to_be_deleted.insert (*i);
+                               break;
 
-void MidiModel::DeltaCommand::undo()
-{
-       // This could be made much faster by using a priority_queue for added and
-       // removed notes (or sort here), and doing a single iteration over _model
+                       case InsertMergeTruncateExisting:
+                               /* resetting the start time of the existing note
+                                  is a problem because of time ordering.
+                               */
+                               break;
+
+                       case InsertMergeTruncateAddition:
+                               set_note_length = true;
+                               note_length = min (note_length, ((*i)->time() - note->time()));
+                               break;
 
-       // Need to reset iterator to drop the read lock it holds, or we'll deadlock
-       const bool reset_iter = (_model->_read_iter.locked());
-       const double iter_time = _model->_read_iter->time();
+                       case InsertMergeExtend:
+                               /* we can't reset the time of the existing note because
+                                  that will corrupt time ordering. So remove the
+                                  existing note and change the position/length
+                                  of the new note (which has not been added yet)
+                               */
+                               to_be_deleted.insert (*i);
+                               set_note_length = true;
+                               note_length = min (note_length, (*i)->end_time() - note->time());
+                               break;
+                       default:
+                               /*NOTREACHED*/
+                               /* stupid gcc */
+                               break;
+                       }
+                       break;
 
-       if (reset_iter)
-               _model->_read_iter = _model->end(); // drop read lock
+               case OverlapExternal:
+                       cerr << "OverlapExt\n";
+                       /* existing note overlaps all the new note */
+                       switch (insert_merge_policy()) {
+                       case InsertMergeReplace:
+                               to_be_deleted.insert (*i);
+                               break;
+                       case InsertMergeTruncateExisting:
+                       case InsertMergeTruncateAddition:
+                       case InsertMergeExtend:
+                               /* cannot add in this case */
+                               return -1;
+                       default:
+                               /*NOTREACHED*/
+                               /* stupid gcc */
+                               break;
+                       }
+                       break;
 
-       assert( ! _model->_read_iter.locked());
+               case OverlapInternal:
+                       cerr << "OverlapInt\n";
+                       /* new note fully overlaps an existing note */
+                       switch (insert_merge_policy()) {
+                       case InsertMergeReplace:
+                       case InsertMergeTruncateExisting:
+                       case InsertMergeTruncateAddition:
+                       case InsertMergeExtend:
+                               /* delete the existing note, the new one will cover it */
+                               to_be_deleted.insert (*i);
+                               break;
+                       default:
+                               /*NOTREACHED*/
+                               /* stupid gcc */
+                               break;
+                       }
+                       break;
 
-       _model->write_lock();
+               default:
+                       /*NOTREACHED*/
+                       /* stupid gcc */
+                       break;
+               }
+       }
 
-       for (std::list< boost::shared_ptr<Note> >::iterator i = _added_notes.begin(); i
-                       != _added_notes.end(); ++i)
-               _model->remove_note_unlocked(*i);
+       for (set<NotePtr>::iterator i = to_be_deleted.begin(); i != to_be_deleted.end(); ++i) {
+               remove_note_unlocked (*i);
 
-       for (std::list< boost::shared_ptr<Note> >::iterator i =
-                       _removed_notes.begin(); i != _removed_notes.end(); ++i)
-               _model->add_note_unlocked(*i);
+               if (cmd) {
+                       cmd->side_effect_remove (*i);
+               }
+       }
 
-       _model->write_unlock();
+       if (set_note_time) {
+               if (cmd) {
+                       cmd->change (note, NoteDiffCommand::StartTime, note_time);
+               }
+               note->set_time (note_time);
+       }
 
-       if (reset_iter)
-               _model->_read_iter = const_iterator(*_model.get(), iter_time);
+       if (set_note_length) {
+               if (cmd) {
+                       cmd->change (note, NoteDiffCommand::Length, note_length);
+               }
+               note->set_length (note_length);
+       }
 
-       _model->ContentsChanged(); /* EMIT SIGNAL */
+       return 0;
 }
 
-XMLNode & MidiModel::DeltaCommand::marshal_note(const boost::shared_ptr<Note> note)
+InsertMergePolicy
+MidiModel::insert_merge_policy () const
 {
-       XMLNode *xml_note = new XMLNode("note");
-       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 << int(note->time());
-       xml_note->add_property("time", time_str.str());
-
-       ostringstream duration_str(ios::ate);
-       duration_str <<(unsigned int) note->duration();
-       xml_note->add_property("duration", duration_str.str());
-
-       ostringstream velocity_str(ios::ate);
-       velocity_str << (unsigned int) note->velocity();
-       xml_note->add_property("velocity", velocity_str.str());
+       /* XXX ultimately this should be a per-track or even per-model policy */
+       boost::shared_ptr<MidiSource> ms = _midi_source.lock ();
+       assert (ms);
 
-       return *xml_note;
+       return ms->session().config.get_insert_merge_policy ();
 }
 
-boost::shared_ptr<Note> MidiModel::DeltaCommand::unmarshal_note(XMLNode *xml_note)
+void
+MidiModel::set_midi_source (boost::shared_ptr<MidiSource> s)
 {
-       unsigned int note;
-       istringstream note_str(xml_note->property("note")->value());
-       note_str >> note;
+       boost::shared_ptr<MidiSource> old = _midi_source.lock ();
 
-       unsigned int channel;
-       istringstream channel_str(xml_note->property("channel")->value());
-       channel_str >> channel;
+       if (old) {
+               old->invalidate ();
+       }
 
-       unsigned int time;
-       istringstream time_str(xml_note->property("time")->value());
-       time_str >> time;
+       _midi_source_connections.drop_connections ();
 
-       unsigned int duration;
-       istringstream duration_str(xml_note->property("duration")->value());
-       duration_str >> duration;
+       _midi_source = s;
 
-       unsigned int velocity;
-       istringstream velocity_str(xml_note->property("velocity")->value());
-       velocity_str >> velocity;
+       s->InterpolationChanged.connect_same_thread (
+               _midi_source_connections, boost::bind (&MidiModel::source_interpolation_changed, this, _1, _2)
+               );
 
-       boost::shared_ptr<Note> note_ptr(new Note(channel, time, duration, note, velocity));
-       return note_ptr;
+       s->AutomationStateChanged.connect_same_thread (
+               _midi_source_connections, boost::bind (&MidiModel::source_automation_state_changed, this, _1, _2)
+               );
 }
 
-#define ADDED_NOTES_ELEMENT "added_notes"
-#define REMOVED_NOTES_ELEMENT "removed_notes"
-#define DELTA_COMMAND_ELEMENT "DeltaCommand"
+/** The source has signalled that the interpolation style for a parameter has changed.  In order to
+ *  keep MidiSource and ControlList interpolation state the same, we pass this change onto the
+ *  appropriate ControlList.
+ *
+ *  The idea is that MidiSource and the MidiModel's ControlList states are kept in sync, and one
+ *  or the other is listened to by the GUI.
+ */
+void
+MidiModel::source_interpolation_changed (Evoral::Parameter p, Evoral::ControlList::InterpolationStyle s)
+{
+       Glib::Mutex::Lock lm (_control_lock);
+       control(p)->list()->set_interpolation (s);
+}
 
-int MidiModel::DeltaCommand::set_state(const XMLNode& delta_command)
+/** A ControlList has signalled that its interpolation style has changed.  Again, in order to keep
+ *  MidiSource and ControlList interpolation state in sync, we pass this change onto our MidiSource.
+ */
+void
+MidiModel::control_list_interpolation_changed (Evoral::Parameter p, Evoral::ControlList::InterpolationStyle s)
 {
-       if (delta_command.name() != string(DELTA_COMMAND_ELEMENT)) {
-               return 1;
-       }
+       boost::shared_ptr<MidiSource> ms = _midi_source.lock ();
+       assert (ms);
 
-       _added_notes.clear();
-       XMLNode *added_notes = delta_command.child(ADDED_NOTES_ELEMENT);
-       XMLNodeList notes = added_notes->children();
-       transform(notes.begin(), notes.end(), back_inserter(_added_notes),
-                       sigc::mem_fun(*this, &DeltaCommand::unmarshal_note));
+       ms->set_interpolation_of (p, s);
+}
 
-       _removed_notes.clear();
-       XMLNode *removed_notes = delta_command.child(REMOVED_NOTES_ELEMENT);
-       notes = removed_notes->children();
-       transform(notes.begin(), notes.end(), back_inserter(_removed_notes),
-                       sigc::mem_fun(*this, &DeltaCommand::unmarshal_note));
+void
+MidiModel::source_automation_state_changed (Evoral::Parameter p, AutoState s)
+{
+       Glib::Mutex::Lock lm (_control_lock);
+       boost::shared_ptr<AutomationList> al = boost::dynamic_pointer_cast<AutomationList> (control(p)->list ());
+       al->set_automation_state (s);
+}
 
-       return 0;
+void
+MidiModel::automation_list_automation_state_changed (Evoral::Parameter p, AutoState s)
+{
+       boost::shared_ptr<MidiSource> ms = _midi_source.lock ();
+       assert (ms);
+       ms->set_automation_state_of (p, s);
 }
 
-XMLNode& MidiModel::DeltaCommand::get_state()
+boost::shared_ptr<Evoral::Control>
+MidiModel::control_factory (Evoral::Parameter const & p)
 {
-       XMLNode *delta_command = new XMLNode(DELTA_COMMAND_ELEMENT);
-       delta_command->add_property("midi_source", _model->midi_source()->id().to_s());
+       boost::shared_ptr<Evoral::Control> c = Automatable::control_factory (p);
+
+       /* Set up newly created control's lists to the appropriate interpolation and
+          automation state from our source.
+       */
+
+       boost::shared_ptr<MidiSource> ms = _midi_source.lock ();
+       assert (ms);
+
+       c->list()->set_interpolation (ms->interpolation_of (p));
 
-       XMLNode *added_notes = delta_command->add_child(ADDED_NOTES_ELEMENT);
-       for_each(_added_notes.begin(), _added_notes.end(), sigc::compose(
-                       sigc::mem_fun(*added_notes, &XMLNode::add_child_nocopy),
-                       sigc::mem_fun(*this, &DeltaCommand::marshal_note)));
+       boost::shared_ptr<AutomationList> al = boost::dynamic_pointer_cast<AutomationList> (c->list ());
+       assert (al);
 
-       XMLNode *removed_notes = delta_command->add_child(REMOVED_NOTES_ELEMENT);
-       for_each(_removed_notes.begin(), _removed_notes.end(), sigc::compose(
-                       sigc::mem_fun(*removed_notes, &XMLNode::add_child_nocopy),
-                       sigc::mem_fun(*this, &DeltaCommand::marshal_note)));
+       al->set_automation_state (ms->automation_state_of (p));
 
-       return *delta_command;
+       return c;
 }
 
-struct EventTimeComparator {
-       typedef const MIDI::Event* value_type;
-       inline bool operator()(const MIDI::Event* a, const MIDI::Event* b) const {
-               return a->time() >= b->time();
-       }
-};
+boost::shared_ptr<const MidiSource>
+MidiModel::midi_source ()
+{
+       return _midi_source.lock ();
+}
 
-/** Write the model to a MidiSource (i.e. save the model).
- * This is different from manually using read to write to a source in that
- * note off events are written regardless of the track mode.  This is so the
- * user can switch a recorded track (with note durations from some instrument)
- * to percussive, save, reload, then switch it back to sustained without
- * destroying the original note durations.
+/** Moves notes, controllers and sys-ex to insert silence at the start of the model.
+ *  Adds commands to the session's current undo stack to reflect the movements.
  */
-bool MidiModel::write_to(boost::shared_ptr<MidiSource> source)
+void
+MidiModel::insert_silence_at_start (TimeType t)
 {
-       read_lock();
+       boost::shared_ptr<MidiSource> s = _midi_source.lock ();
+       assert (s);
 
-       const NoteMode old_note_mode = _note_mode;
-       _note_mode = Sustained;
-       
-       for (const_iterator i = begin(); i != end(); ++i) {
-               source->append_event_unlocked(Frames, *i);
+       /* Notes */
+
+       if (!notes().empty ()) {
+               NoteDiffCommand* c = new_note_diff_command ("insert silence");
+
+               for (Notes::const_iterator i = notes().begin(); i != notes().end(); ++i) {
+                       c->change (*i, NoteDiffCommand::StartTime, (*i)->time() + t);
+               }
+
+               apply_command_as_subcommand (s->session(), c);
        }
-               
-       _note_mode = old_note_mode;
-       
-       read_unlock();
-       _edited = false;
 
-       return true;
+       /* Controllers */
+
+       for (Controls::iterator i = controls().begin(); i != controls().end(); ++i) {
+               boost::shared_ptr<AutomationControl> ac = boost::dynamic_pointer_cast<AutomationControl> (i->second);
+               XMLNode& before = ac->alist()->get_state ();
+               i->second->list()->shift (0, t);
+               XMLNode& after = ac->alist()->get_state ();
+               s->session().add_command (new MementoCommand<AutomationList> (new MidiAutomationListBinder (s, i->first), &before, &after));
+       }
+
+       /* Sys-ex */
+
+       if (!sysexes().empty()) {
+               SysExDiffCommand* c = new_sysex_diff_command ("insert silence");
+
+               for (SysExes::iterator i = sysexes().begin(); i != sysexes().end(); ++i) {
+                       c->change (*i, (*i)->time() + t);
+               }
+
+               apply_command_as_subcommand (s->session(), c);
+       }
 }
 
-XMLNode& MidiModel::get_state()
+/** 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)
 {
-       XMLNode *node = new XMLNode("MidiModel");
-       return *node;
-}
+       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;
+
+               } 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);
+
+               }
+       }
+
+       apply_command (s->session (), c);
+}