X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_model.cc;h=18378f53866d26a3b2964ae81ab71e3ec242797b;hb=c35e94a3c83028220f6eb494fdfe9c1960aaf751;hp=039b44e8bd4f18d12c76f4e64cec059d37949008;hpb=da4270a93d7c440b89f1a517e69ff5cb10c9076a;p=ardour.git diff --git a/libs/ardour/midi_model.cc b/libs/ardour/midi_model.cc index 039b44e8bd..18378f5386 100644 --- a/libs/ardour/midi_model.cc +++ b/libs/ardour/midi_model.cc @@ -18,23 +18,27 @@ */ -#include -#include #include +#include +#include #include #include -#include "pbd/error.h" -#include "pbd/enumwriter.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/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 "i18n.h" @@ -160,84 +164,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); } @@ -285,13 +260,22 @@ 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: @@ -299,7 +283,7 @@ MidiModel::NoteDiffCommand::operator() () _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: @@ -307,18 +291,18 @@ 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; } @@ -337,7 +321,7 @@ MidiModel::NoteDiffCommand::operator() () _removed_notes.push_back (*i); } } - + if (!side_effect_removals.empty()) { cerr << "SER: \n"; for (set::iterator i = side_effect_removals.begin(); i != side_effect_removals.end(); ++i) { @@ -369,15 +353,25 @@ MidiModel::NoteDiffCommand::undo () /* 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) { + 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() - ) { + 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 @@ -388,46 +382,42 @@ MidiModel::NoteDiffCommand::undo () _model->remove_note_unlocked (i->note); temporary_removals.insert (i->note); } - i->note->set_note (i->old_value); + i->note->set_note (i->old_value.get_int()); break; case StartTime: - if ( - temporary_removals.find (i->note) == temporary_removals.end() && - find (_removed_notes.begin(), _removed_notes.end(), i->note) == _removed_notes.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); + i->note->set_time (i->old_value.get_beats()); break; case Channel: - if ( - temporary_removals.find (i->note) == temporary_removals.end() && - find (_removed_notes.begin(), _removed_notes.end(), i->note) == _removed_notes.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); + i->note->set_velocity (i->old_value.get_int()); break; case Length: - i->note->set_length (i->old_time); + i->note->set_length (i->old_value.get_beats()); break; } } @@ -449,7 +439,7 @@ MidiModel::NoteDiffCommand::undo () _model->add_note_unlocked (*i); } } - + _model->ContentsChanged(); /* EMIT SIGNAL */ } @@ -503,8 +493,8 @@ MidiModel::NoteDiffCommand::unmarshal_note (XMLNode *xml_note) unsigned int note; XMLProperty* prop; unsigned int channel; - unsigned int time; - unsigned int length; + MidiModel::TimeType time; + MidiModel::TimeType length; unsigned int velocity; gint id; @@ -537,7 +527,7 @@ MidiModel::NoteDiffCommand::unmarshal_note (XMLNode *xml_note) time_str >> time; } else { warning << "note information missing time" << endmsg; - time = 0; + time = MidiModel::TimeType(); } if ((prop = xml_note->property("length")) != 0) { @@ -545,7 +535,7 @@ MidiModel::NoteDiffCommand::unmarshal_note (XMLNode *xml_note) length_str >> length; } else { warning << "note information missing length" << endmsg; - length = 1; + length = MidiModel::TimeType(1); } if ((prop = xml_note->property("velocity")) != 0) { @@ -574,9 +564,9 @@ MidiModel::NoteDiffCommand::marshal_change (const NoteChange& change) { ostringstream old_value_str (ios::ate); if (change.property == StartTime || change.property == Length) { - old_value_str << change.old_time; + old_value_str << change.old_value.get_beats(); } else { - old_value_str << (unsigned int) change.old_value; + old_value_str << change.old_value.get_int(); } xml_change->add_property ("old", old_value_str.str()); } @@ -584,16 +574,24 @@ MidiModel::NoteDiffCommand::marshal_change (const NoteChange& change) { ostringstream new_value_str (ios::ate); if (change.property == StartTime || change.property == Length) { - new_value_str << change.new_time; + new_value_str << change.new_value.get_beats(); } else { - new_value_str << (unsigned int) change.new_value; + new_value_str << change.new_value.get_int(); } 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()); + if (change.note) { + id_str << change.note->id(); + xml_change->add_property ("id", id_str.str()); + } else if (change.note_id) { + warning << _("Change has no note, using note ID") << endmsg; + id_str << change.note_id; + xml_change->add_property ("id", id_str.str()); + } else { + error << _("Change has no note or note ID") << endmsg; + } return *xml_change; } @@ -603,12 +601,13 @@ 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 { fatal << "!!!" << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ } if ((prop = xml_change->property ("id")) == 0) { @@ -621,7 +620,9 @@ MidiModel::NoteDiffCommand::unmarshal_change (XMLNode *xml_change) if ((prop = xml_change->property ("old")) != 0) { istringstream old_str (prop->value()); if (change.property == StartTime || change.property == Length) { - old_str >> change.old_time; + Evoral::MusicalTime old_time; + old_str >> old_time; + change.old_value = old_time; } else { int integer_value_so_that_istream_does_the_right_thing; old_str >> integer_value_so_that_istream_does_the_right_thing; @@ -629,13 +630,15 @@ MidiModel::NoteDiffCommand::unmarshal_change (XMLNode *xml_change) } } 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; + Evoral::MusicalTime new_time; + new_str >> new_time; + change.new_value = Variant(new_time); } else { int integer_value_so_that_istream_does_the_right_thing; new_str >> integer_value_so_that_istream_does_the_right_thing; @@ -643,19 +646,17 @@ MidiModel::NoteDiffCommand::unmarshal_change (XMLNode *xml_change) } } 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; } @@ -782,6 +783,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: @@ -799,6 +813,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: @@ -812,6 +839,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) { @@ -850,7 +883,7 @@ MidiModel::SysExDiffCommand::unmarshal_change (XMLNode *xml_change) change.property = (Property) string_2_enum (prop->value(), change.property); } else { fatal << "!!!" << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ } if ((prop = xml_change->property ("id")) == 0) { @@ -865,7 +898,7 @@ MidiModel::SysExDiffCommand::unmarshal_change (XMLNode *xml_change) old_str >> change.old_time; } else { fatal << "!!!" << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ } if ((prop = xml_change->property ("new")) != 0) { @@ -873,7 +906,7 @@ MidiModel::SysExDiffCommand::unmarshal_change (XMLNode *xml_change) new_str >> change.new_time; } else { fatal << "!!!" << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ } /* we must point at the instance of the sysex that is actually in the model. @@ -881,11 +914,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; } @@ -973,6 +1002,7 @@ MidiModel::PatchChangeDiffCommand::change_channel (PatchChangePtr patch, uint8_t c.patch = patch; c.old_channel = patch->channel (); c.new_channel = channel; + c.patch_id = patch->id(); _changes.push_back (c); } @@ -985,6 +1015,7 @@ MidiModel::PatchChangeDiffCommand::change_program (PatchChangePtr patch, uint8_t c.patch = patch; c.old_program = patch->program (); c.new_program = program; + c.patch_id = patch->id(); _changes.push_back (c); } @@ -1015,6 +1046,15 @@ MidiModel::PatchChangeDiffCommand::operator() () _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) { @@ -1063,6 +1103,15 @@ MidiModel::PatchChangeDiffCommand::undo () _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) { @@ -1187,12 +1236,12 @@ MidiModel::PatchChangePtr MidiModel::PatchChangeDiffCommand::unmarshal_patch_change (XMLNode* n) { XMLProperty* prop; - Evoral::event_id_t id; - Evoral::MusicalTime time = 0; - uint8_t channel = 0; - uint8_t program = 0; + Evoral::event_id_t id = 0; + Evoral::MusicalTime time = Evoral::MusicalTime(); + int channel = 0; + int program = 0; int bank = 0; - + if ((prop = n->property ("id")) != 0) { istringstream s (prop->value()); s >> id; @@ -1219,6 +1268,7 @@ MidiModel::PatchChangeDiffCommand::unmarshal_patch_change (XMLNode* n) } PatchChangePtr p (new Evoral::PatchChange (time, channel, program, bank)); + assert(id); p->set_id (id); return p; } @@ -1228,6 +1278,7 @@ MidiModel::PatchChangeDiffCommand::unmarshal_change (XMLNode* n) { XMLProperty* prop; Change c; + int an_int; prop = n->property ("property"); assert (prop); @@ -1237,6 +1288,10 @@ MidiModel::PatchChangeDiffCommand::unmarshal_change (XMLNode* n) assert (prop); Evoral::event_id_t const id = atoi (prop->value().c_str()); + /* we need to load via an int intermediate for all properties that are + actually uint8_t (char/byte). + */ + prop = n->property ("old"); assert (prop); { @@ -1244,11 +1299,14 @@ MidiModel::PatchChangeDiffCommand::unmarshal_change (XMLNode* n) if (c.property == Time) { s >> c.old_time; } else if (c.property == Channel) { - s >> c.old_channel; + s >> an_int; + c.old_channel = an_int; } else if (c.property == Program) { - s >> c.old_program; + s >> an_int; + c.old_program = an_int; } else if (c.property == Bank) { - s >> c.old_bank; + s >> an_int; + c.old_bank = an_int; } } @@ -1256,19 +1314,23 @@ MidiModel::PatchChangeDiffCommand::unmarshal_change (XMLNode* n) assert (prop); { istringstream s (prop->value ()); + if (c.property == Time) { s >> c.new_time; } else if (c.property == Channel) { - s >> c.new_channel; + s >> an_int; + c.new_channel = an_int; } else if (c.property == Program) { - s >> c.new_program; + s >> an_int; + c.new_program = an_int; } else if (c.property == Bank) { - s >> c.new_bank; + s >> an_int; + c.new_bank = an_int; } } c.patch = _model->find_patch_change (id); - assert (c.patch); + c.patch_id = id; return c; } @@ -1348,25 +1410,23 @@ MidiModel::PatchChangeDiffCommand::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()); + 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); @@ -1379,7 +1439,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()); @@ -1387,16 +1447,19 @@ MidiModel::sync_to_source () set_percussive(false); boost::shared_ptr ms = _midi_source.lock (); - assert (ms); + if (!ms) { + error << "MIDI model has no source to sync to" << endmsg; + return false; + } - ms->mark_streaming_midi_write_started (note_mode()); + 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); @@ -1411,7 +1474,10 @@ 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, + Evoral::MusicalTime begin_time, + Evoral::MusicalTime end_time) { ReadLock lock(read_lock()); MidiStateTracker mst; @@ -1419,13 +1485,10 @@ MidiModel::write_section_to (boost::shared_ptr source, Evoral::Music 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()); + 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) { + for (Evoral::Sequence::const_iterator i = begin(TimeType(), true); i != end(); ++i) { const Evoral::Event& ev (*i); if (ev.time() >= begin_time && ev.time() < end_time) { @@ -1448,22 +1511,22 @@ MidiModel::write_section_to (boost::shared_ptr source, Evoral::Music continue; } - source->append_event_unlocked_beats (*i); + source->append_event_beats (source_lock, *i); mst.remove (mev->note(), mev->channel()); } else if (mev->is_note_on()) { mst.add (mev->note(), mev->channel()); - source->append_event_unlocked_beats(*i); + source->append_event_beats(source_lock, *i); } else { - source->append_event_unlocked_beats(*i); + source->append_event_beats(source_lock, *i); } } } - mst.resolve_notes (*source, end_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); @@ -1551,8 +1614,8 @@ MidiModel::edit_lock() boost::shared_ptr 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 + Glib::Threads::Mutex::Lock* source_lock = new Glib::Threads::Mutex::Lock (ms->mutex()); + ms->invalidate(*source_lock); // Release cached iterator's read lock on model return WriteLock(new WriteLockImpl(source_lock, _lock, _control_lock)); } @@ -1566,7 +1629,7 @@ MidiModel::write_lock() assert (ms); assert (!ms->mutex().trylock ()); - return WriteLock(new WriteLockImpl(NULL, _lock, _control_lock)); + return WriteLock(new WriteLockImpl(0, _lock, _control_lock)); } int @@ -1584,7 +1647,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; @@ -1650,7 +1713,7 @@ MidiModel::resolve_overlaps_unlocked (const NotePtr note, void* arg) return -1; /* do not add the new note */ break; default: - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ /* stupid gcc */ break; } @@ -1686,7 +1749,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; } @@ -1705,7 +1768,7 @@ MidiModel::resolve_overlaps_unlocked (const NotePtr note, void* arg) /* cannot add in this case */ return -1; default: - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ /* stupid gcc */ break; } @@ -1723,14 +1786,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; } @@ -1777,7 +1840,8 @@ 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 (); @@ -1803,7 +1867,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); } @@ -1822,7 +1886,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); } @@ -1863,7 +1927,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 @@ -1884,12 +1948,24 @@ MidiModel::insert_silence_at_start (TimeType 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); + } + /* Controllers */ 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)); } @@ -1950,5 +2026,7 @@ MidiModel::transpose (TimeType from, TimeType to, int semitones) void MidiModel::control_list_marked_dirty () { + AutomatableSequence::control_list_marked_dirty (); + ContentsChanged (); /* EMIT SIGNAL */ }