add some assert for reloading saved plugin pin connections

[ardour.git] / libs / ardour / midi_model.cc

diff --git a/libs/ardour/midi_model.cc b/libs/ardour/midi_model.cc
index e3226e036f060efff5dd8113a0c5652d50be8c5b..1950fbeb190d2a6e519be494557ebc5c5d1a6f67 100644 (file)
--- a/libs/ardour/midi_model.cc
+++ b/libs/ardour/midi_model.cc
@@ -321,7 +321,7 @@ MidiModel::NoteDiffCommand::operator() ()
                                _removed_notes.push_back (*i);
                        }
                }
-               
+
                if (!side_effect_removals.empty()) {
                        cerr << "SER: \n";
                        for (set<NotePtr>::iterator i = side_effect_removals.begin(); i != side_effect_removals.end(); ++i) {
@@ -364,7 +364,7 @@ MidiModel::NoteDiffCommand::undo ()
                                assert (i->note);
                        }
                }
-                               
+
                for (ChangeList::iterator i = _changes.begin(); i != _changes.end(); ++i) {
                        Property prop = i->property;
 
@@ -439,7 +439,7 @@ MidiModel::NoteDiffCommand::undo ()
                        _model->add_note_unlocked (*i);
                }
        }
-       
+
        _model->ContentsChanged(); /* EMIT SIGNAL */
 }
 
@@ -1236,14 +1236,15 @@ MidiModel::PatchChangePtr
 MidiModel::PatchChangeDiffCommand::unmarshal_patch_change (XMLNode* n)
 {
        XMLProperty* prop;
+       XMLProperty* prop_id;
        Evoral::event_id_t id = 0;
        Evoral::Beats time = Evoral::Beats();
        int channel = 0;
        int program = 0;
        int bank = 0;
-       
-       if ((prop = n->property ("id")) != 0) {
-               istringstream s (prop->value());
+
+       if ((prop_id = n->property ("id")) != 0) {
+               istringstream s (prop_id->value());
                s >> id;
        }
 
@@ -1268,7 +1269,7 @@ MidiModel::PatchChangeDiffCommand::unmarshal_patch_change (XMLNode* n)
        }
 
        PatchChangePtr p (new Evoral::PatchChange<TimeType> (time, channel, program, bank));
-       assert(id);
+       assert(prop_id);
        p->set_id (id);
        return p;
 }
@@ -1288,7 +1289,7 @@ 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 
+       /* we need to load via an int intermediate for all properties that are
           actually uint8_t (char/byte).
        */
 
@@ -1452,6 +1453,11 @@ MidiModel::sync_to_source (const Glib::Threads::Mutex::Lock& source_lock)
                return false;
        }
 
+       /* Invalidate and store active notes, which will be picked up by the iterator
+          on the next roll if time progresses linearly. */
+       ms->invalidate(source_lock,
+                      ms->session().transport_rolling() ? &_active_notes : NULL);
+
        ms->mark_streaming_midi_write_started (source_lock, note_mode());
 
        for (Evoral::Sequence<TimeType>::const_iterator i = begin(TimeType(), true); i != end(); ++i) {
@@ -1611,25 +1617,19 @@ MidiModel::find_sysex (gint sysex_id)
 MidiModel::WriteLock
 MidiModel::edit_lock()
 {
-       boost::shared_ptr<MidiSource> ms = _midi_source.lock ();
-       assert (ms);
-
-       Glib::Threads::Mutex::Lock* source_lock = new Glib::Threads::Mutex::Lock (ms->mutex());
-       ms->invalidate(*source_lock); // Release cached iterator's read lock on model
-       return WriteLock(new WriteLockImpl(source_lock, _lock, _control_lock));
-}
+       boost::shared_ptr<MidiSource> ms          = _midi_source.lock();
+       Glib::Threads::Mutex::Lock*   source_lock = 0;
 
-/** Lock just the model, the source lock must already be held.
- * This should only be called from libardour/evoral places
- */
-MidiModel::WriteLock
-MidiModel::write_lock()
-{
-       boost::shared_ptr<MidiSource> ms = _midi_source.lock ();
-       assert (ms);
+       if (ms) {
+               /* Take source lock and invalidate iterator to release its lock on model.
+                  Add currently active notes to _active_notes so we can restore them
+                  if playback resumes at the same point after the edit. */
+               source_lock = new Glib::Threads::Mutex::Lock(ms->mutex());
+               ms->invalidate(*source_lock,
+                              ms->session().transport_rolling() ? &_active_notes : NULL);
+       }
 
-       assert (!ms->mutex().trylock ());
-       return WriteLock(new WriteLockImpl(0, _lock, _control_lock));
+       return WriteLock(new WriteLockImpl(source_lock, _lock, _control_lock));
 }
 
 int
@@ -1665,9 +1665,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;
@@ -1983,50 +1983,24 @@ MidiModel::insert_silence_at_start (TimeType t)
        }
 }
 
-/** Transpose notes in a time range by a given number of semitones.  Notes
- *  will be clamped at 0 and 127 if the transposition would make them exceed
- *  that range.
- *
- *  @param from Start time.
- *  @param end End time.
- *  @param semitones Number of semitones to transpose by (+ve is higher, -ve is lower).
- */
 void
-MidiModel::transpose (TimeType from, TimeType to, int semitones)
+MidiModel::transpose (NoteDiffCommand* c, const NotePtr note_ptr, int semitones)
 {
-       boost::shared_ptr<const MidiSource> s = midi_source ();
-
-       NoteDiffCommand* c = new_note_diff_command (_("transpose"));
-
-       for (Notes::iterator i = notes().begin(); i != notes().end(); ++i) {
-
-               if ((*i)->time() >= to) {
-
-                       /* finished */
-                       break;
+       int new_note = note_ptr->note() + semitones;
 
-               } else if ((*i)->time() >= from) {
-
-                       int new_note = (*i)->note() + semitones;
-
-                       if (new_note < 0) {
-                               new_note = 0;
-                       } else if (new_note > 127) {
-                               new_note = 127;
-                       }
-
-                       c->change (*i, NoteDiffCommand::NoteNumber, (uint8_t) new_note);
-
-               }
+       if (new_note < 0) {
+               new_note = 0;
+       } else if (new_note > 127) {
+               new_note = 127;
        }
 
-       apply_command (s->session (), c);
+       c->change (note_ptr, NoteDiffCommand::NoteNumber, (uint8_t) new_note);
 }
 
 void
 MidiModel::control_list_marked_dirty ()
 {
        AutomatableSequence<Evoral::Beats>::control_list_marked_dirty ();
-       
+
        ContentsChanged (); /* EMIT SIGNAL */
 }