X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_model.cc;h=5c1f65d96b2703aaf15399944976ab1b9bf429dc;hb=5e1cfcc7ed557fc28ca8b362deceefa1967ab22b;hp=039b44e8bd4f18d12c76f4e64cec059d37949008;hpb=da4270a93d7c440b89f1a517e69ff5cb10c9076a;p=ardour.git diff --git a/libs/ardour/midi_model.cc b/libs/ardour/midi_model.cc index 039b44e8bd..5c1f65d96b 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" @@ -285,6 +289,15 @@ 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()) { @@ -337,7 +350,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 +382,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 @@ -392,10 +415,8 @@ MidiModel::NoteDiffCommand::undo () 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 ... */ @@ -406,10 +427,8 @@ MidiModel::NoteDiffCommand::undo () 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 ... */ @@ -449,7 +468,7 @@ MidiModel::NoteDiffCommand::undo () _model->add_note_unlocked (*i); } } - + _model->ContentsChanged(); /* EMIT SIGNAL */ } @@ -503,8 +522,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; @@ -647,15 +666,13 @@ MidiModel::NoteDiffCommand::unmarshal_change (XMLNode *xml_change) } /* 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 +799,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 +829,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 +855,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) { @@ -881,11 +930,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; } @@ -1015,6 +1060,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 +1117,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) { @@ -1189,10 +1252,10 @@ 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; + int channel = 0; + int program = 0; int bank = 0; - + if ((prop = n->property ("id")) != 0) { istringstream s (prop->value()); s >> id; @@ -1228,6 +1291,7 @@ MidiModel::PatchChangeDiffCommand::unmarshal_change (XMLNode* n) { XMLProperty* prop; Change c; + int an_int; prop = n->property ("property"); assert (prop); @@ -1237,6 +1301,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 +1312,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 +1327,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; } @@ -1551,7 +1626,7 @@ MidiModel::edit_lock() boost::shared_ptr ms = _midi_source.lock (); assert (ms); - Glib::Mutex::Lock* source_lock = new Glib::Mutex::Lock (ms->mutex()); + Glib::Threads::Mutex::Lock* source_lock = new Glib::Threads::Mutex::Lock (ms->mutex()); ms->invalidate(); // Release cached iterator's read lock on model return WriteLock(new WriteLockImpl(source_lock, _lock, _control_lock)); } @@ -1566,7 +1641,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 @@ -1803,7 +1878,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 +1897,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 +1938,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,6 +1959,18 @@ 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) { @@ -1950,5 +2037,7 @@ MidiModel::transpose (TimeType from, TimeType to, int semitones) void MidiModel::control_list_marked_dirty () { + AutomatableSequence::control_list_marked_dirty (); + ContentsChanged (); /* EMIT SIGNAL */ }