X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_model.cc;h=13268cd84ad9c270896be0e94d278333d0910586;hb=8c04457be14673385287def048c387b3953fa8e8;hp=e185300ccae20b6a87cb4afc654c8f31e37eb97f;hpb=f6ed36a457aace0c4f0c542014d8a3fc65c7a852;p=ardour.git diff --git a/libs/ardour/midi_model.cc b/libs/ardour/midi_model.cc index e185300cca..13268cd84a 100644 --- a/libs/ardour/midi_model.cc +++ b/libs/ardour/midi_model.cc @@ -1,6 +1,6 @@ /* Copyright (C) 2007 Paul Davis - Author: Dave Robillard + 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 @@ -18,22 +18,36 @@ */ -#include -#include #include +#include +#include #include #include -#include "pbd/error.h" + +#include "pbd/compose.h" #include "pbd/enumwriter.h" +#include "pbd/error.h" + +#include "evoral/Control.hpp" + #include "midi++/events.h" +#include "ardour/automation_control.h" +#include "ardour/evoral_types_convert.h" +#include "ardour/midi_automation_list_binder.h" #include "ardour/midi_model.h" #include "ardour/midi_source.h" #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 "ardour/types.h" + +#include "pbd/i18n.h" + +namespace PBD { + DEFINE_ENUM_CONVERT(ARDOUR::MidiModel::NoteDiffCommand::Property); + DEFINE_ENUM_CONVERT(ARDOUR::MidiModel::SysExDiffCommand::Property); + DEFINE_ENUM_CONVERT(ARDOUR::MidiModel::PatchChangeDiffCommand::Property); +} using namespace std; using namespace ARDOUR; @@ -52,24 +66,34 @@ MidiModel::MidiModel (boost::shared_ptr s) * formality, until apply_command is called and ownership is taken. */ MidiModel::NoteDiffCommand* -MidiModel::new_note_diff_command (const string name) +MidiModel::new_note_diff_command (const string& name) { boost::shared_ptr 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) +MidiModel::new_sysex_diff_command (const string& name) { boost::shared_ptr 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 ms = _midi_source.lock (); + assert (ms); + + return new PatchChangeDiffCommand (ms->model(), name); +} + /** Apply a command. * @@ -79,10 +103,10 @@ MidiModel::new_sysex_diff_command (const string name) void MidiModel::apply_command(Session& session, Command* cmd) { - session.begin_reversible_command(cmd->name()); + session.begin_reversible_command (cmd->name()); (*cmd)(); - session.commit_reversible_command(cmd); - set_edited(true); + session.commit_reversible_command (cmd); + set_edited (true); } /** Apply a command as part of a larger reversible transaction @@ -94,8 +118,8 @@ void MidiModel::apply_command_as_subcommand(Session& session, Command* cmd) { (*cmd)(); - session.add_command(cmd); - set_edited(true); + session.add_command (cmd); + set_edited (true); } /************** DIFF COMMAND ********************/ @@ -107,6 +131,10 @@ MidiModel::apply_command_as_subcommand(Session& session, Command* cmd) #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 m, const std::string& name) : Command (name) @@ -143,84 +171,55 @@ 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) +Variant +MidiModel::NoteDiffCommand::get_value (const NotePtr note, Property prop) { - assert (note); - - NoteChange change; - switch (prop) { case NoteNumber: - if (new_value == note->note()) { - return; - } - change.old_value = note->note(); - break; + return Variant(note->note()); case Velocity: - if (new_value == note->velocity()) { - return; - } - change.old_value = note->velocity(); - break; + return Variant(note->velocity()); case Channel: - if (new_value == note->channel()) { - return; - } - change.old_value = note->channel(); - break; - - + return Variant(note->channel()); case StartTime: - fatal << "MidiModel::DiffCommand::change() with integer argument called for start time" << endmsg; - /*NOTREACHED*/ - break; + return Variant(note->time()); case Length: - fatal << "MidiModel::DiffCommand::change() with integer argument called for length" << endmsg; - /*NOTREACHED*/ - break; + return Variant(note->length()); } - change.note = note; - change.property = prop; - change.new_value = new_value; - - _changes.push_back (change); + return Variant(); } -void -MidiModel::NoteDiffCommand::change (const NotePtr note, Property prop, - TimeType new_time) +Variant::Type +MidiModel::NoteDiffCommand::value_type(Property prop) { - 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 Channel: + return Variant::INT; 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; + return Variant::BEATS; } - change.note = note; - change.property = prop; - change.new_time = new_time; + return Variant::NOTHING; +} + +void +MidiModel::NoteDiffCommand::change (const NotePtr note, + Property prop, + const Variant& new_value) +{ + assert (note); + + const NoteChange change = { + prop, note, 0, get_value(note, prop), new_value + }; + + if (change.old_value == new_value) { + return; + } _changes.push_back (change); } @@ -268,22 +267,30 @@ MidiModel::NoteDiffCommand::operator() () for (ChangeList::iterator i = _changes.begin(); i != _changes.end(); ++i) { Property prop = i->property; + + if (!i->note) { + /* note found during deserialization, so try + again now that the model state is different. + */ + i->note = _model->find_note (i->note_id); + assert (i->note); + } + 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); + i->note->set_note (i->new_value.get_int()); 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); + i->note->set_time (i->new_value.get_beats()); break; case Channel: @@ -291,24 +298,23 @@ MidiModel::NoteDiffCommand::operator() () _model->remove_note_unlocked (i->note); temporary_removals.insert (i->note); } - i->note->set_channel (i->new_value); + i->note->set_channel (i->new_value.get_int()); break; /* no remove-then-add required for these properties, since we do not index them */ case Velocity: - i->note->set_velocity (i->new_value); + i->note->set_velocity (i->new_value.get_int()); break; case Length: - i->note->set_length (i->new_time); + i->note->set_length (i->new_value.get_beats()); break; } } - for (set::iterator i = temporary_removals.begin(); i != temporary_removals.end(); ++i) { NoteDiffCommand side_effects (model(), "side effects"); if (_model->add_note_unlocked (*i, &side_effects)) { @@ -316,23 +322,9 @@ MidiModel::NoteDiffCommand::operator() () *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. It is an un-note. + 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. */ - - /* We didn't change it... */ - for (ChangeList::iterator j = _changes.begin(); j != _changes.end(); ) { - - ChangeList::iterator k = j; - ++k; - - if (*i == j->note) { - _changes.erase (j); - } - - j = k; - } - - /* ...in fact, we removed it */ _removed_notes.push_back (*i); } } @@ -358,46 +350,89 @@ MidiModel::NoteDiffCommand::undo () _model->remove_note_unlocked(*i); } - for (NoteList::iterator i = _removed_notes.begin(); i != _removed_notes.end(); ++i) { - _model->add_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 temporary_removals; + + /* lazily discover any affected notes that were not discovered when + * loading the history because of deletions, etc. + */ + + for (ChangeList::iterator i = _changes.begin(); i != _changes.end(); ++i) { + if (!i->note) { + i->note = _model->find_note (i->note_id); + assert (i->note); + } + } + 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()) { + 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 Velocity: - i->note->set_velocity (i->old_value); + i->note->set_note (i->old_value.get_int()); break; + case StartTime: - if (temporary_removals.find (i->note) == temporary_removals.end()) { + 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 Length: - i->note->set_length (i->old_time); + i->note->set_time (i->old_value.get_beats()); break; + case Channel: - if (temporary_removals.find (i->note) == temporary_removals.end()) { + 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); + i->note->set_channel (i->old_value.get_int()); + break; + + /* no remove-then-add required for these properties, since we do not index them + */ + + case Velocity: + i->note->set_velocity (i->old_value.get_int()); + break; + + case Length: + i->note->set_length (i->old_value.get_beats()); break; } } + for (NoteList::iterator i = _removed_notes.begin(); i != _removed_notes.end(); ++i) { + _model->add_note_unlocked(*i); + } + for (set::iterator i = temporary_removals.begin(); i != temporary_removals.end(); ++i) { _model->add_note_unlocked (*i); } @@ -420,41 +455,12 @@ MidiModel::NoteDiffCommand::marshal_note(const NotePtr note) { XMLNode* xml_note = new XMLNode("note"); - { - ostringstream id_str(ios::ate); - id_str << int(note->id()); - xml_note->add_property("id", id_str.str()); - } - - { - ostringstream note_str(ios::ate); - note_str << int(note->note()); - xml_note->add_property("note", note_str.str()); - } - - { - ostringstream channel_str(ios::ate); - channel_str << int(note->channel()); - xml_note->add_property("channel", channel_str.str()); - } - - { - ostringstream time_str(ios::ate); - time_str << note->time(); - xml_note->add_property("time", time_str.str()); - } - - { - ostringstream length_str(ios::ate); - length_str << note->length(); - xml_note->add_property("length", length_str.str()); - } - - { - ostringstream velocity_str(ios::ate); - velocity_str << (unsigned int) note->velocity(); - xml_note->add_property("velocity", velocity_str.str()); - } + xml_note->set_property ("id", note->id ()); + xml_note->set_property ("note", note->note ()); + xml_note->set_property ("channel", note->channel ()); + xml_note->set_property ("time", note->time ()); + xml_note->set_property ("length", note->length ()); + xml_note->set_property ("velocity", note->velocity ()); return *xml_note; } @@ -462,58 +468,38 @@ MidiModel::NoteDiffCommand::marshal_note(const NotePtr note) Evoral::Sequence::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 { + Evoral::event_id_t id; + if (!xml_note->get_property ("id", id)) { error << "note information missing ID value" << endmsg; id = -1; } - if ((prop = xml_note->property("note")) != 0) { - istringstream note_str(prop->value()); - note_str >> note; - } else { + uint8_t note; + if (!xml_note->get_property("note", note)) { warning << "note information missing note value" << endmsg; note = 127; } - if ((prop = xml_note->property("channel")) != 0) { - istringstream channel_str(prop->value()); - channel_str >> channel; - } else { + uint8_t channel; + if (!xml_note->get_property("channel", channel)) { warning << "note information missing channel" << endmsg; channel = 0; } - if ((prop = xml_note->property("time")) != 0) { - istringstream time_str(prop->value()); - time_str >> time; - } else { + MidiModel::TimeType time; + if (!xml_note->get_property("time", time)) { warning << "note information missing time" << endmsg; - time = 0; + time = MidiModel::TimeType(); } - if ((prop = xml_note->property("length")) != 0) { - istringstream length_str(prop->value()); - length_str >> length; - } else { + MidiModel::TimeType length; + if (!xml_note->get_property("length", length)) { warning << "note information missing length" << endmsg; - length = 1; + length = MidiModel::TimeType(1); } - if ((prop = xml_note->property("velocity")) != 0) { - istringstream velocity_str(prop->value()); - velocity_str >> velocity; - } else { + uint8_t velocity; + if (!xml_note->get_property("velocity", velocity)) { warning << "note information missing velocity" << endmsg; velocity = 127; } @@ -531,31 +517,28 @@ MidiModel::NoteDiffCommand::marshal_change (const NoteChange& change) /* first, the change itself */ - xml_change->add_property ("property", enum_2_string (change.property)); + xml_change->set_property ("property", change.property); - { - ostringstream old_value_str (ios::ate); - if (change.property == StartTime || change.property == Length) { - old_value_str << change.old_time; - } else { - old_value_str << (unsigned int) change.old_value; - } - xml_change->add_property ("old", old_value_str.str()); + if (change.property == StartTime || change.property == Length) { + xml_change->set_property ("old", change.old_value.get_beats ()); + } else { + xml_change->set_property ("old", change.old_value.get_int ()); } - { - ostringstream new_value_str (ios::ate); - if (change.property == StartTime || change.property == Length) { - new_value_str << change.new_time; - } else { - new_value_str << (unsigned int) change.new_value; - } - xml_change->add_property ("new", new_value_str.str()); + if (change.property == StartTime || change.property == Length) { + xml_change->set_property ("new", change.new_value.get_beats ()); + } else { + xml_change->set_property ("new", change.new_value.get_int ()); } - ostringstream id_str; - id_str << change.note->id(); - xml_change->add_property ("id", id_str.str()); + if (change.note) { + xml_change->set_property ("id", change.note->id()); + } else if (change.note_id) { + warning << _("Change has no note, using note ID") << endmsg; + xml_change->set_property ("id", change.note_id); + } else { + error << _("Change has no note or note ID") << endmsg; + } return *xml_change; } @@ -563,61 +546,52 @@ MidiModel::NoteDiffCommand::marshal_change (const NoteChange& change) MidiModel::NoteDiffCommand::NoteChange MidiModel::NoteDiffCommand::unmarshal_change (XMLNode *xml_change) { - XMLProperty* prop; NoteChange change; + change.note_id = 0; - if ((prop = xml_change->property("property")) != 0) { - change.property = (Property) string_2_enum (prop->value(), change.property); - } else { + if (!xml_change->get_property("property", change.property)) { fatal << "!!!" << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ } - if ((prop = xml_change->property ("id")) == 0) { + int note_id; + if (!xml_change->get_property ("id", note_id)) { error << _("No NoteID found for note property change - ignored") << endmsg; return change; } - gint note_id = atoi (prop->value().c_str()); - - if ((prop = xml_change->property ("old")) != 0) { - istringstream old_str (prop->value()); - if (change.property == StartTime || change.property == Length) { - 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; - } + int old_val; + Evoral::Beats old_time; + if ((change.property == StartTime || change.property == Length) && + xml_change->get_property ("old", old_time)) { + change.old_value = old_time; + } else if (xml_change->get_property ("old", old_val)) { + change.old_value = old_val; } else { fatal << "!!!" << endmsg; - /*NOTREACHED*/ + abort(); /*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; - } + int new_val; + Evoral::Beats new_time; + if ((change.property == StartTime || change.property == Length) && + xml_change->get_property ("new", new_time)) { + change.new_value = new_time; + } else if (xml_change->get_property ("new", new_val)) { + change.new_value = new_val; } else { fatal << "!!!" << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ } /* we must point at the instance of the note that is actually in the model. - so go look for it ... + so go look for it ... it may not be there (it could have been + deleted in a later operation, so store the note id so that we can + look it up again later). */ 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; - } + change.note_id = note_id; return change; } @@ -684,32 +658,32 @@ XMLNode& MidiModel::NoteDiffCommand::get_state () { XMLNode* diff_command = new XMLNode (NOTE_DIFF_COMMAND_ELEMENT); - diff_command->add_property("midi-source", _model->midi_source()->id().to_s()); + diff_command->set_property("midi-source", _model->midi_source()->id().to_s()); XMLNode* changes = diff_command->add_child(DIFF_NOTES_ELEMENT); - for_each(_changes.begin(), _changes.end(), + 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(), + 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(), + 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 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(), + 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))); @@ -744,6 +718,19 @@ MidiModel::SysExDiffCommand::operator() () { MidiModel::WriteLock lock (_model->edit_lock ()); + for (list::iterator i = _removed.begin(); i != _removed.end(); ++i) { + _model->remove_sysex_unlocked (*i); + } + + /* find any sysex events that were missing when unmarshalling */ + + for (ChangeList::iterator i = _changes.begin(); i != _changes.end(); ++i) { + if (!i->sysex) { + i->sysex = _model->find_sysex (i->sysex_id); + assert (i->sysex); + } + } + for (ChangeList::iterator i = _changes.begin(); i != _changes.end(); ++i) { switch (i->property) { case Time: @@ -761,6 +748,19 @@ MidiModel::SysExDiffCommand::undo () { MidiModel::WriteLock lock (_model->edit_lock ()); + for (list::iterator i = _removed.begin(); i != _removed.end(); ++i) { + _model->add_sysex_unlocked (*i); + } + + /* find any sysex events that were missing when unmarshalling */ + + for (ChangeList::iterator i = _changes.begin(); i != _changes.end(); ++i) { + if (!i->sysex) { + i->sysex = _model->find_sysex (i->sysex_id); + assert (i->sysex); + } + } + for (ChangeList::iterator i = _changes.begin(); i != _changes.end(); ++i) { switch (i->property) { case Time: @@ -774,6 +774,12 @@ MidiModel::SysExDiffCommand::undo () _model->ContentsChanged(); /* EMIT SIGNAL */ } +void +MidiModel::SysExDiffCommand::remove (SysExPtr sysex) +{ + _removed.push_back(sysex); +} + XMLNode& MidiModel::SysExDiffCommand::marshal_change (const Change& change) { @@ -781,23 +787,10 @@ MidiModel::SysExDiffCommand::marshal_change (const Change& change) /* first, the change itself */ - xml_change->add_property ("property", enum_2_string (change.property)); - - { - ostringstream old_value_str (ios::ate); - old_value_str << change.old_time; - xml_change->add_property ("old", old_value_str.str()); - } - - { - ostringstream new_value_str (ios::ate); - new_value_str << change.new_time; - xml_change->add_property ("new", new_value_str.str()); - } - - ostringstream id_str; - id_str << change.sysex->id(); - xml_change->add_property ("id", id_str.str()); + xml_change->set_property ("property", change.property); + xml_change->set_property ("old", change.old_time); + xml_change->set_property ("new", change.new_time); + xml_change->set_property ("id", change.sysex->id()); return *xml_change; } @@ -805,37 +798,27 @@ MidiModel::SysExDiffCommand::marshal_change (const Change& change) MidiModel::SysExDiffCommand::Change MidiModel::SysExDiffCommand::unmarshal_change (XMLNode *xml_change) { - XMLProperty* prop; Change change; - if ((prop = xml_change->property ("property")) != 0) { - change.property = (Property) string_2_enum (prop->value(), change.property); - } else { + if (!xml_change->get_property ("property", change.property)) { fatal << "!!!" << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ } - if ((prop = xml_change->property ("id")) == 0) { + int sysex_id; + if (!xml_change->get_property ("id", sysex_id)) { error << _("No SysExID found for sys-ex property change - ignored") << endmsg; return change; } - gint sysex_id = atoi (prop->value().c_str()); - - if ((prop = xml_change->property ("old")) != 0) { - istringstream old_str (prop->value()); - old_str >> change.old_time; - } else { + if (!xml_change->get_property ("old", change.old_time)) { fatal << "!!!" << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ } - if ((prop = xml_change->property ("new")) != 0) { - istringstream new_str (prop->value()); - new_str >> change.new_time; - } else { + if (!xml_change->get_property ("new", change.new_time)) { fatal << "!!!" << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ } /* we must point at the instance of the sysex that is actually in the model. @@ -843,11 +826,7 @@ MidiModel::SysExDiffCommand::unmarshal_change (XMLNode *xml_change) */ 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; - } + change.sysex_id = sysex_id; return change; } @@ -879,10 +858,10 @@ XMLNode& MidiModel::SysExDiffCommand::get_state () { XMLNode* diff_command = new XMLNode (SYSEX_DIFF_COMMAND_ELEMENT); - diff_command->add_property ("midi-source", _model->midi_source()->id().to_s()); + diff_command->set_property ("midi-source", _model->midi_source()->id().to_s()); XMLNode* changes = diff_command->add_child(DIFF_SYSEXES_ELEMENT); - for_each (_changes.begin(), _changes.end(), + for_each (_changes.begin(), _changes.end(), boost::bind ( boost::bind (&XMLNode::add_child_nocopy, changes, _1), boost::bind (&SysExDiffCommand::marshal_change, this, _1))); @@ -890,6 +869,369 @@ MidiModel::SysExDiffCommand::get_state () return *diff_command; } +MidiModel::PatchChangeDiffCommand::PatchChangeDiffCommand (boost::shared_ptr m, const string& name) + : DiffCommand (m, name) +{ + assert (_model); +} + +MidiModel::PatchChangeDiffCommand::PatchChangeDiffCommand (boost::shared_ptr 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::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; + c.patch_id = patch->id(); + + _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; + c.patch_id = patch->id(); + + _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::iterator i = _added.begin(); i != _added.end(); ++i) { + _model->add_patch_change_unlocked (*i); + } + + for (list::iterator i = _removed.begin(); i != _removed.end(); ++i) { + _model->remove_patch_change_unlocked (*i); + } + + /* find any patch change events that were missing when unmarshalling */ + + for (ChangeList::iterator i = _changes.begin(); i != _changes.end(); ++i) { + if (!i->patch) { + i->patch = _model->find_patch_change (i->patch_id); + assert (i->patch); + } + } + + set 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::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::iterator i = _added.begin(); i != _added.end(); ++i) { + _model->remove_patch_change_unlocked (*i); + } + + for (list::iterator i = _removed.begin(); i != _removed.end(); ++i) { + _model->add_patch_change_unlocked (*i); + } + + /* find any patch change events that were missing when unmarshalling */ + + for (ChangeList::iterator i = _changes.begin(); i != _changes.end(); ++i) { + if (!i->patch) { + i->patch = _model->find_patch_change (i->patch_id); + assert (i->patch); + } + } + + set 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::iterator i = temporary_removals.begin(); i != temporary_removals.end(); ++i) { + _model->add_patch_change_unlocked (*i); + } + + } + + _model->ContentsChanged (); /* EMIT SIGNAL */ +} + +XMLNode & +MidiModel::PatchChangeDiffCommand::marshal_patch_change (constPatchChangePtr p) +{ + XMLNode* n = new XMLNode ("patch-change"); + + n->set_property ("id", p->id ()); + n->set_property ("time", p->time ()); + n->set_property ("channel", p->channel ()); + n->set_property ("program", p->program ()); + n->set_property ("bank", p->bank ()); + + return *n; +} + +XMLNode& +MidiModel::PatchChangeDiffCommand::marshal_change (const Change& c) +{ + XMLNode* n = new XMLNode (X_("Change")); + + n->set_property (X_("property"), c.property); + + if (c.property == Time) { + n->set_property (X_("old"), c.old_time); + } else if (c.property == Channel) { + n->set_property (X_("old"), c.old_channel); + } else if (c.property == Program) { + n->set_property (X_("old"), c.old_program); + } else if (c.property == Bank) { + n->set_property (X_("old"), c.old_bank); + } + + if (c.property == Time) { + n->set_property (X_ ("new"), c.new_time); + } else if (c.property == Channel) { + n->set_property (X_ ("new"), c.new_channel); + } else if (c.property == Program) { + n->set_property (X_ ("new"), c.new_program); + } else if (c.property == Bank) { + n->set_property (X_ ("new"), c.new_bank); + } + + n->set_property ("id", c.patch->id ()); + + return *n; +} + +MidiModel::PatchChangePtr +MidiModel::PatchChangeDiffCommand::unmarshal_patch_change (XMLNode* n) +{ + Evoral::event_id_t id = 0; + if (!n->get_property ("id", id)) { + assert(false); + } + + Evoral::Beats time = Evoral::Beats(); + if (!n->get_property ("time", time)) { + // warning?? + } + + uint8_t channel = 0; + if (!n->get_property ("channel", channel)) { + // warning?? + } + + int program = 0; + if (!n->get_property ("program", program)) { + // warning?? + } + + int bank = 0; + if (!n->get_property ("bank", bank)) { + // warning?? + } + + PatchChangePtr p (new Evoral::PatchChange (time, channel, program, bank)); + p->set_id (id); + return p; +} + +MidiModel::PatchChangeDiffCommand::Change +MidiModel::PatchChangeDiffCommand::unmarshal_change (XMLNode* n) +{ + Change c; + Evoral::event_id_t id; + + if (!n->get_property ("property", c.property) || !n->get_property ("id", id)) { + assert(false); + } + + if ((c.property == Time && !n->get_property ("old", c.old_time)) || + (c.property == Channel && !n->get_property ("old", c.old_channel)) || + (c.property == Program && !n->get_property ("old", c.old_program)) || + (c.property == Bank && !n->get_property ("old", c.old_bank))) { + assert (false); + } + + if ((c.property == Time && !n->get_property ("new", c.new_time)) || + (c.property == Channel && !n->get_property ("new", c.new_channel)) || + (c.property == Program && !n->get_property ("new", c.new_program)) || + (c.property == Bank && !n->get_property ("new", c.new_bank))) { + assert (false); + } + + c.patch = _model->find_patch_change (id); + c.patch_id = id; + + return c; +} + +int +MidiModel::PatchChangeDiffCommand::set_state (const XMLNode& diff_command, int /*version*/) +{ + if (diff_command.name() != PATCH_CHANGE_DIFF_COMMAND_ELEMENT) { + return 1; + } + + _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)); + } + + _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)); + } + + _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 0; +} + +XMLNode & +MidiModel::PatchChangeDiffCommand::get_state () +{ + XMLNode* diff_command = new XMLNode (PATCH_CHANGE_DIFF_COMMAND_ELEMENT); + diff_command->set_property("midi-source", _model->midi_source()->id().to_s()); + + XMLNode* added = diff_command->add_child (ADDED_PATCH_CHANGES_ELEMENT); + for_each (_added.begin(), _added.end(), + 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; +} + /** 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 @@ -901,28 +1243,26 @@ MidiModel::SysExDiffCommand::get_state () * `Discrete' mode). */ bool -MidiModel::write_to (boost::shared_ptr source) +MidiModel::write_to (boost::shared_ptr source, + const Glib::Threads::Mutex::Lock& source_lock) { ReadLock lock(read_lock()); const bool old_percussive = percussive(); set_percussive(false); - boost::shared_ptr ms = _midi_source.lock (); - assert (ms); - - source->drop_model(); - source->mark_streaming_midi_write_started (note_mode(), ms->timeline_position ()); + source->drop_model(source_lock); + source->mark_streaming_midi_write_started (source_lock, note_mode()); - for (Evoral::Sequence::const_iterator i = begin(0, true); i != end(); ++i) { - source->append_event_unlocked_beats(*i); + for (Evoral::Sequence::const_iterator i = begin(TimeType(), true); i != end(); ++i) { + source->append_event_beats(source_lock, *i); } set_percussive(old_percussive); - source->mark_streaming_write_completed(); + source->mark_streaming_write_completed(source_lock); set_edited(false); - + return true; } @@ -932,7 +1272,7 @@ MidiModel::write_to (boost::shared_ptr source) of the model. */ bool -MidiModel::sync_to_source () +MidiModel::sync_to_source (const Glib::Threads::Mutex::Lock& source_lock) { ReadLock lock(read_lock()); @@ -940,19 +1280,26 @@ MidiModel::sync_to_source () set_percussive(false); boost::shared_ptr ms = _midi_source.lock (); - assert (ms); - - ms->mark_streaming_midi_write_started (note_mode(), ms->timeline_position()); + if (!ms) { + error << "MIDI model has no source to sync to" << endmsg; + return false; + } + + /* Invalidate and store active notes, which will be picked up by the iterator + on the next roll if time progresses linearly. */ + ms->invalidate(source_lock); + + ms->mark_streaming_midi_write_started (source_lock, note_mode()); - for (Evoral::Sequence::const_iterator i = begin(0, true); i != end(); ++i) { - ms->append_event_unlocked_beats(*i); + for (Evoral::Sequence::const_iterator i = begin(TimeType(), true); i != end(); ++i) { + ms->append_event_beats(source_lock, *i); } set_percussive (old_percussive); - ms->mark_streaming_write_completed (); + ms->mark_streaming_write_completed (source_lock); set_edited (false); - + return true; } @@ -964,76 +1311,59 @@ MidiModel::sync_to_source () * destroying the original note durations. */ bool -MidiModel::write_section_to (boost::shared_ptr source, Evoral::MusicalTime begin_time, Evoral::MusicalTime end_time) +MidiModel::write_section_to (boost::shared_ptr source, + const Glib::Threads::Mutex::Lock& source_lock, + TimeType begin_time, + TimeType end_time, + bool offset_events) { ReadLock lock(read_lock()); MidiStateTracker mst; - Evoral::MusicalTime extra_note_on_time = end_time; const bool old_percussive = percussive(); set_percussive(false); - boost::shared_ptr ms = _midi_source.lock (); - assert (ms); - - source->drop_model(); - source->mark_streaming_midi_write_started (note_mode(), ms->timeline_position()); - - for (Evoral::Sequence::const_iterator i = begin(0, true); i != end(); ++i) { - const Evoral::Event& ev (*i); + source->drop_model(source_lock); + source->mark_streaming_midi_write_started (source_lock, note_mode()); - if (ev.time() >= begin_time && ev.time() < end_time) { + for (Evoral::Sequence::const_iterator i = begin(TimeType(), true); i != end(); ++i) { + if (i->time() >= begin_time && i->time() < end_time) { - const Evoral::MIDIEvent* mev = - static_cast* > (&ev); + Evoral::Event mev (*i, true); /* copy the event */ - if (!mev) { - continue; + if (offset_events) { + mev.set_time(mev.time() - begin_time); } + if (mev.is_note_off()) { - if (mev->is_note_off()) { - - if (!mst.active (mev->note(), mev->channel())) { - - /* add a note-on at the start of the range we're writing - to the file. velocity is just an arbitary reasonable value. + if (!mst.active (mev.note(), mev.channel())) { + /* the matching note-on was outside the + time range we were given, so just + ignore this note-off. */ - - Evoral::MIDIEvent 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()); - - 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; + continue; } - cerr << "MIDI Note off (note = " << (int) mev->note() << endl; - source->append_event_unlocked_beats (*i); - mst.remove (mev->note(), mev->channel()); - mst.dump (cerr); + source->append_event_beats (source_lock, mev); + mst.remove (mev.note(), mev.channel()); - } 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 if (mev.is_note_on()) { + mst.add (mev.note(), mev.channel()); + source->append_event_beats(source_lock, mev); } else { - cerr << "MIDI other event type\n"; - source->append_event_unlocked_beats(*i); + source->append_event_beats(source_lock, mev); } } } - mst.resolve_notes (*source, end_time); + if (offset_events) { + end_time -= begin_time; + } + mst.resolve_notes (*source, source_lock, end_time); set_percussive(old_percussive); - source->mark_streaming_write_completed(); + source->mark_streaming_write_completed(source_lock); set_edited(false); @@ -1084,6 +1414,18 @@ MidiModel::find_note (gint note_id) return NotePtr(); } +MidiModel::PatchChangePtr +MidiModel::find_patch_change (Evoral::event_id_t id) +{ + for (PatchChanges::iterator i = patch_changes().begin(); i != patch_changes().end(); ++i) { + if ((*i)->id() == id) { + return *i; + } + } + + return PatchChangePtr (); +} + boost::shared_ptr > MidiModel::find_sysex (gint sysex_id) { @@ -1106,27 +1448,20 @@ MidiModel::find_sysex (gint sysex_id) MidiModel::WriteLock MidiModel::edit_lock() { - boost::shared_ptr ms = _midi_source.lock (); - assert (ms); + boost::shared_ptr ms = _midi_source.lock(); + Glib::Threads::Mutex::Lock* source_lock = 0; + + if (ms) { + /* Take source lock and invalidate iterator to release its lock on model. + Add currently active notes to _active_notes so we can restore them + if playback resumes at the same point after the edit. */ + source_lock = new Glib::Threads::Mutex::Lock(ms->mutex()); + ms->invalidate(*source_lock); + } - 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)); } -/** Lock just the model, the source lock must already be held. - * This should only be called from libardour/evoral places - */ -MidiModel::WriteLock -MidiModel::write_lock() -{ - boost::shared_ptr ms = _midi_source.lock (); - assert (ms); - - assert (!ms->mutex().trylock ()); - return WriteLock(new WriteLockImpl(NULL, _lock, _control_lock)); -} - int MidiModel::resolve_overlaps_unlocked (const NotePtr note, void* arg) { @@ -1142,7 +1477,7 @@ MidiModel::resolve_overlaps_unlocked (const NotePtr note, void* arg) TimeType ea = note->end_time(); const Pitches& p (pitches (note->channel())); - NotePtr search_note(new Note(0, 0, 0, note->note())); + NotePtr search_note(new Note(0, TimeType(), TimeType(), note->note())); set to_be_deleted; bool set_note_length = false; bool set_note_time = false; @@ -1150,8 +1485,8 @@ MidiModel::resolve_overlaps_unlocked (const NotePtr note, void* arg) TimeType note_length = note->length(); DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1 checking overlaps for note %2 @ %3\n", this, (int)note->note(), note->time())); - - for (Pitches::const_iterator i = p.lower_bound (search_note); + + for (Pitches::const_iterator i = p.lower_bound (search_note); i != p.end() && (*i)->note() == note->note(); ++i) { TimeType sb = (*i)->time(); @@ -1160,9 +1495,9 @@ MidiModel::resolve_overlaps_unlocked (const NotePtr note, void* arg) if ((sb > sa) && (eb <= ea)) { overlap = OverlapInternal; - } else if ((eb >= sa) && (eb <= ea)) { + } else if ((eb > sa) && (eb <= ea)) { overlap = OverlapStart; - } else if ((sb > sa) && (sb <= ea)) { + } else if ((sb > sa) && (sb < ea)) { overlap = OverlapEnd; } else if ((sa >= sb) && (sa <= eb) && (ea <= eb)) { overlap = OverlapExternal; @@ -1171,8 +1506,9 @@ MidiModel::resolve_overlaps_unlocked (const NotePtr note, void* arg) continue; } - DEBUG_TRACE (DEBUG::Sequence, string_compose ("\toverlap is %1 for (%2,%3) vs (%4,%5)\n", enum_2_string(overlap), - sa, ea, sb, eb)); + DEBUG_TRACE (DEBUG::Sequence, string_compose ( + "\toverlap is %1 for (%2,%3) vs (%4,%5)\n", + enum_2_string(overlap), sa, ea, sb, eb)); if (insert_merge_policy() == InsertMergeReject) { DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1 just reject\n", this)); @@ -1202,12 +1538,12 @@ MidiModel::resolve_overlaps_unlocked (const NotePtr note, void* arg) 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*/ + abort(); /*NOTREACHED*/ /* stupid gcc */ break; } @@ -1243,7 +1579,7 @@ MidiModel::resolve_overlaps_unlocked (const NotePtr note, void* arg) note_length = min (note_length, (*i)->end_time() - note->time()); break; default: - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ /* stupid gcc */ break; } @@ -1262,7 +1598,7 @@ MidiModel::resolve_overlaps_unlocked (const NotePtr note, void* arg) /* cannot add in this case */ return -1; default: - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ /* stupid gcc */ break; } @@ -1280,14 +1616,14 @@ MidiModel::resolve_overlaps_unlocked (const NotePtr note, void* arg) to_be_deleted.insert (*i); break; default: - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ /* stupid gcc */ break; } break; default: - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ /* stupid gcc */ break; } @@ -1304,14 +1640,14 @@ MidiModel::resolve_overlaps_unlocked (const NotePtr note, void* arg) if (set_note_time) { if (cmd) { cmd->change (note, NoteDiffCommand::StartTime, note_time); - } + } note->set_time (note_time); } if (set_note_length) { if (cmd) { cmd->change (note, NoteDiffCommand::Length, note_length); - } + } note->set_length (note_length); } @@ -1319,7 +1655,7 @@ MidiModel::resolve_overlaps_unlocked (const NotePtr note, void* arg) } InsertMergePolicy -MidiModel::insert_merge_policy () const +MidiModel::insert_merge_policy () const { /* XXX ultimately this should be a per-track or even per-model policy */ boost::shared_ptr ms = _midi_source.lock (); @@ -1327,14 +1663,15 @@ MidiModel::insert_merge_policy () const return ms->session().config.get_insert_merge_policy (); } - + void MidiModel::set_midi_source (boost::shared_ptr s) { boost::shared_ptr old = _midi_source.lock (); - + if (old) { - old->invalidate (); + Source::Lock lm(old->mutex()); + old->invalidate (lm); } _midi_source_connections.drop_connections (); @@ -1360,7 +1697,7 @@ MidiModel::set_midi_source (boost::shared_ptr s) void MidiModel::source_interpolation_changed (Evoral::Parameter p, Evoral::ControlList::InterpolationStyle s) { - Glib::Mutex::Lock lm (_control_lock); + Glib::Threads::Mutex::Lock lm (_control_lock); control(p)->list()->set_interpolation (s); } @@ -1379,7 +1716,7 @@ MidiModel::control_list_interpolation_changed (Evoral::Parameter p, Evoral::Cont void MidiModel::source_automation_state_changed (Evoral::Parameter p, AutoState s) { - Glib::Mutex::Lock lm (_control_lock); + Glib::Threads::Mutex::Lock lm (_control_lock); boost::shared_ptr al = boost::dynamic_pointer_cast (control(p)->list ()); al->set_automation_state (s); } @@ -1420,7 +1757,7 @@ MidiModel::midi_source () return _midi_source.lock (); } -/** Moves notes, controllers and sys-ex to insert silence at the start of the model. +/** Moves notes, patch changes, 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. */ void @@ -1428,16 +1765,28 @@ MidiModel::insert_silence_at_start (TimeType t) { boost::shared_ptr s = _midi_source.lock (); assert (s); - + /* 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); + } + + /* Patch changes */ + + if (!patch_changes().empty ()) { + PatchChangeDiffCommand* c = new_patch_change_diff_command ("insert silence"); + + for (PatchChanges::const_iterator i = patch_changes().begin(); i != patch_changes().end(); ++i) { + c->change_time (*i, (*i)->time() + t); + } + apply_command_as_subcommand (s->session(), c); } @@ -1446,7 +1795,7 @@ MidiModel::insert_silence_at_start (TimeType t) for (Controls::iterator i = controls().begin(); i != controls().end(); ++i) { boost::shared_ptr ac = boost::dynamic_pointer_cast (i->second); XMLNode& before = ac->alist()->get_state (); - i->second->list()->shift (0, t); + i->second->list()->shift (0, t.to_double()); XMLNode& after = ac->alist()->get_state (); s->session().add_command (new MementoCommand (new MidiAutomationListBinder (s, i->first), &before, &after)); } @@ -1462,4 +1811,28 @@ MidiModel::insert_silence_at_start (TimeType t) apply_command_as_subcommand (s->session(), c); } + + ContentsShifted (t.to_double()); +} + +void +MidiModel::transpose (NoteDiffCommand* c, const NotePtr note_ptr, int semitones) +{ + int new_note = note_ptr->note() + semitones; + + if (new_note < 0) { + new_note = 0; + } else if (new_note > 127) { + new_note = 127; + } + + c->change (note_ptr, NoteDiffCommand::NoteNumber, (uint8_t) new_note); +} + +void +MidiModel::control_list_marked_dirty () +{ + AutomatableSequence::control_list_marked_dirty (); + + ContentsChanged (); /* EMIT SIGNAL */ }