X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_model.cc;h=4e895c5a925a9f898767d6d98366133e9abb0927;hb=935fd3b32f600d6f20c134fa2ccae78aa4781de5;hp=7e88569adc5d874194272cd6d1f9a575b7da1abc;hpb=63935a86a49ce647084fb9c72d18f7ec09b7608f;p=ardour.git diff --git a/libs/ardour/midi_model.cc b/libs/ardour/midi_model.cc index 7e88569adc..4e895c5a92 100644 --- a/libs/ardour/midi_model.cc +++ b/libs/ardour/midi_model.cc @@ -40,7 +40,7 @@ #include "ardour/session.h" #include "ardour/types.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; @@ -321,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) { @@ -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 */ } @@ -491,7 +491,7 @@ Evoral::Sequence::NotePtr MidiModel::NoteDiffCommand::unmarshal_note (XMLNode *xml_note) { unsigned int note; - XMLProperty* prop; + XMLProperty const * prop; unsigned int channel; MidiModel::TimeType time; MidiModel::TimeType length; @@ -599,7 +599,7 @@ MidiModel::NoteDiffCommand::marshal_change (const NoteChange& change) MidiModel::NoteDiffCommand::NoteChange MidiModel::NoteDiffCommand::unmarshal_change (XMLNode *xml_change) { - XMLProperty* prop; + XMLProperty const * prop; NoteChange change; change.note_id = 0; @@ -876,7 +876,7 @@ MidiModel::SysExDiffCommand::marshal_change (const Change& change) MidiModel::SysExDiffCommand::Change MidiModel::SysExDiffCommand::unmarshal_change (XMLNode *xml_change) { - XMLProperty* prop; + XMLProperty const * prop; Change change; if ((prop = xml_change->property ("property")) != 0) { @@ -1235,14 +1235,14 @@ MidiModel::PatchChangeDiffCommand::marshal_change (const Change& c) MidiModel::PatchChangePtr MidiModel::PatchChangeDiffCommand::unmarshal_patch_change (XMLNode* n) { - XMLProperty* prop; - XMLProperty* prop_id; + XMLProperty const * prop; + XMLProperty const * prop_id; Evoral::event_id_t id = 0; Evoral::Beats time = Evoral::Beats(); int channel = 0; int program = 0; int bank = 0; - + if ((prop_id = n->property ("id")) != 0) { istringstream s (prop_id->value()); s >> id; @@ -1277,7 +1277,7 @@ MidiModel::PatchChangeDiffCommand::unmarshal_patch_change (XMLNode* n) MidiModel::PatchChangeDiffCommand::Change MidiModel::PatchChangeDiffCommand::unmarshal_change (XMLNode* n) { - XMLProperty* prop; + XMLProperty const * prop; Change c; int an_int; @@ -1289,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). */ @@ -1453,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::const_iterator i = begin(TimeType(), true); i != end(); ++i) { @@ -1477,8 +1482,9 @@ MidiModel::sync_to_source (const Glib::Threads::Mutex::Lock& source_lock) bool MidiModel::write_section_to (boost::shared_ptr source, const Glib::Threads::Mutex::Lock& source_lock, - Evoral::Beats begin_time, - Evoral::Beats end_time) + TimeType begin_time, + TimeType end_time, + bool offset_events) { ReadLock lock(read_lock()); MidiStateTracker mst; @@ -1490,21 +1496,17 @@ MidiModel::write_section_to (boost::shared_ptr source, source->mark_streaming_midi_write_started (source_lock, note_mode()); for (Evoral::Sequence::const_iterator i = begin(TimeType(), true); i != end(); ++i) { - const Evoral::Event& ev (*i); + if (i->time() >= begin_time && i->time() < end_time) { - if (ev.time() >= begin_time && ev.time() < end_time) { + Evoral::MIDIEvent mev (*i, true); /* copy the event */ - const Evoral::MIDIEvent* mev = - static_cast* > (&ev); - - 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())) { + 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. @@ -1512,18 +1514,21 @@ MidiModel::write_section_to (boost::shared_ptr source, continue; } - source->append_event_beats (source_lock, *i); - mst.remove (mev->note(), mev->channel()); + source->append_event_beats (source_lock, mev); + mst.remove (mev.note(), mev.channel()); - } else if (mev->is_note_on()) { - mst.add (mev->note(), mev->channel()); - source->append_event_beats(source_lock, *i); + } else if (mev.is_note_on()) { + mst.add (mev.note(), mev.channel()); + source->append_event_beats(source_lock, mev); } else { - source->append_event_beats(source_lock, *i); + source->append_event_beats(source_lock, mev); } } } + if (offset_events) { + end_time -= begin_time; + } mst.resolve_notes (*source, source_lock, end_time); set_percussive(old_percussive); @@ -1612,25 +1617,19 @@ MidiModel::find_sysex (gint sysex_id) MidiModel::WriteLock MidiModel::edit_lock() { - boost::shared_ptr 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 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 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 @@ -1666,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; @@ -1984,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 s = midi_source (); + int new_note = note_ptr->note() + semitones; - NoteDiffCommand* c = new_note_diff_command (_("transpose")); - - for (Notes::iterator i = notes().begin(); i != notes().end(); ++i) { - - if ((*i)->time() >= to) { - - /* finished */ - break; - - } else if ((*i)->time() >= from) { - - int new_note = (*i)->note() + semitones; - - if (new_note < 0) { - new_note = 0; - } else if (new_note > 127) { - new_note = 127; - } - - c->change (*i, NoteDiffCommand::NoteNumber, (uint8_t) new_note); - - } + 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::control_list_marked_dirty (); - + ContentsChanged (); /* EMIT SIGNAL */ }