X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_model.cc;h=4c6f6633d5e2a7ec90cd2dc3f3822f198f2d43ac;hb=0d7ee3fbd36ed735b17098adb5b35d1ab2927e52;hp=1691380c93da9abb932eedfa1d61047f33da6b59;hpb=be3002c239219e0829dc24ae7e1f93af557c4cf8;p=ardour.git diff --git a/libs/ardour/midi_model.cc b/libs/ardour/midi_model.cc index 1691380c93..4c6f6633d5 100644 --- a/libs/ardour/midi_model.cc +++ b/libs/ardour/midi_model.cc @@ -18,22 +18,29 @@ */ -#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/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" using namespace std; using namespace ARDOUR; @@ -56,7 +63,7 @@ MidiModel::new_note_diff_command (const string name) { boost::shared_ptr ms = _midi_source.lock (); assert (ms); - + return new NoteDiffCommand (ms->model(), name); } @@ -66,7 +73,7 @@ MidiModel::new_sysex_diff_command (const string name) { boost::shared_ptr ms = _midi_source.lock (); assert (ms); - + return new SysExDiffCommand (ms->model(), name); } @@ -76,7 +83,7 @@ MidiModel::new_patch_change_diff_command (const string name) { boost::shared_ptr ms = _midi_source.lock (); assert (ms); - + return new PatchChangeDiffCommand (ms->model(), name); } @@ -162,7 +169,7 @@ MidiModel::NoteDiffCommand::change (const NotePtr note, Property prop, uint8_t new_value) { assert (note); - + NoteChange change; switch (prop) { @@ -208,7 +215,7 @@ MidiModel::NoteDiffCommand::change (const NotePtr note, Property prop, TimeType new_time) { assert (note); - + NoteChange change; switch (prop) { @@ -295,7 +302,6 @@ MidiModel::NoteDiffCommand::operator() () 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); break; @@ -322,7 +328,6 @@ MidiModel::NoteDiffCommand::operator() () } } - 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)) { @@ -330,23 +335,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); } } @@ -372,9 +363,12 @@ 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; @@ -382,36 +376,70 @@ MidiModel::NoteDiffCommand::undo () 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); - 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); - 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); break; + + /* no remove-then-add required for these properties, since we do not index them + */ + + case Velocity: + i->note->set_velocity (i->old_value); + break; + + case Length: + i->note->set_length (i->old_time); + 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); } @@ -479,8 +507,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; @@ -701,29 +729,29 @@ MidiModel::NoteDiffCommand::get_state () diff_command->add_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))); @@ -758,6 +786,10 @@ MidiModel::SysExDiffCommand::operator() () { MidiModel::WriteLock lock (_model->edit_lock ()); + for (list::iterator i = _removed.begin(); i != _removed.end(); ++i) { + _model->remove_sysex_unlocked (*i); + } + for (ChangeList::iterator i = _changes.begin(); i != _changes.end(); ++i) { switch (i->property) { case Time: @@ -775,6 +807,10 @@ MidiModel::SysExDiffCommand::undo () { MidiModel::WriteLock lock (_model->edit_lock ()); + for (list::iterator i = _removed.begin(); i != _removed.end(); ++i) { + _model->add_sysex_unlocked (*i); + } + for (ChangeList::iterator i = _changes.begin(); i != _changes.end(); ++i) { switch (i->property) { case Time: @@ -788,6 +824,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) { @@ -896,7 +938,7 @@ MidiModel::SysExDiffCommand::get_state () diff_command->add_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))); @@ -973,7 +1015,7 @@ MidiModel::PatchChangeDiffCommand::change_bank (PatchChangePtr patch, int bank) c.patch = patch; c.old_bank = patch->bank (); c.new_bank = bank; - + _changes.push_back (c); } @@ -982,7 +1024,7 @@ 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); } @@ -990,7 +1032,7 @@ MidiModel::PatchChangeDiffCommand::operator() () for (list::iterator i = _removed.begin(); i != _removed.end(); ++i) { _model->remove_patch_change_unlocked (*i); } - + set temporary_removals; for (ChangeList::iterator i = _changes.begin(); i != _changes.end(); ++i) { @@ -1038,7 +1080,7 @@ MidiModel::PatchChangeDiffCommand::undo () for (list::iterator i = _removed.begin(); i != _removed.end(); ++i) { _model->add_patch_change_unlocked (*i); } - + set temporary_removals; for (ChangeList::iterator i = _changes.begin(); i != _changes.end(); ++i) { @@ -1068,7 +1110,7 @@ MidiModel::PatchChangeDiffCommand::undo () for (set::iterator i = temporary_removals.begin(); i != temporary_removals.end(); ++i) { _model->add_patch_change_unlocked (*i); } - + } _model->ContentsChanged (); /* EMIT SIGNAL */ @@ -1155,7 +1197,7 @@ MidiModel::PatchChangeDiffCommand::marshal_change (const Change& c) s << c.patch->id (); n->add_property ("id", s.str ()); } - + return *n; } @@ -1173,7 +1215,7 @@ MidiModel::PatchChangeDiffCommand::unmarshal_patch_change (XMLNode* n) istringstream s (prop->value()); s >> id; } - + if ((prop = n->property ("time")) != 0) { istringstream s (prop->value ()); s >> time; @@ -1212,7 +1254,7 @@ MidiModel::PatchChangeDiffCommand::unmarshal_change (XMLNode* n) prop = n->property ("id"); assert (prop); Evoral::event_id_t const id = atoi (prop->value().c_str()); - + prop = n->property ("old"); assert (prop); { @@ -1287,7 +1329,7 @@ MidiModel::PatchChangeDiffCommand::get_state () diff_command->add_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(), + for_each (_added.begin(), _added.end(), boost::bind ( boost::bind (&XMLNode::add_child_nocopy, added, _1), boost::bind (&PatchChangeDiffCommand::marshal_patch_change, this, _1) @@ -1295,13 +1337,13 @@ MidiModel::PatchChangeDiffCommand::get_state () ); XMLNode* removed = diff_command->add_child (REMOVED_PATCH_CHANGES_ELEMENT); - for_each (_removed.begin(), _removed.end(), + 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 ( @@ -1333,7 +1375,7 @@ MidiModel::write_to (boost::shared_ptr source) boost::shared_ptr ms = _midi_source.lock (); assert (ms); - + source->drop_model(); source->mark_streaming_midi_write_started (note_mode()); @@ -1364,7 +1406,7 @@ MidiModel::sync_to_source () boost::shared_ptr ms = _midi_source.lock (); assert (ms); - + ms->mark_streaming_midi_write_started (note_mode()); for (Evoral::Sequence::const_iterator i = begin(0, true); i != end(); ++i) { @@ -1391,14 +1433,13 @@ MidiModel::write_section_to (boost::shared_ptr source, Evoral::Music { 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()); @@ -1407,7 +1448,7 @@ MidiModel::write_section_to (boost::shared_ptr source, Evoral::Music if (ev.time() >= begin_time && ev.time() < end_time) { - const Evoral::MIDIEvent* mev = + const Evoral::MIDIEvent* mev = static_cast* > (&ev); if (!mev) { @@ -1418,36 +1459,20 @@ MidiModel::write_section_to (boost::shared_ptr source, Evoral::Music 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. + /* 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); } 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 { - cerr << "MIDI other event type\n"; source->append_event_unlocked_beats(*i); } } @@ -1544,7 +1569,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)); } @@ -1585,8 +1610,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(); @@ -1638,7 +1663,7 @@ 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; @@ -1740,14 +1765,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); } @@ -1755,7 +1780,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 (); @@ -1768,7 +1793,7 @@ void MidiModel::set_midi_source (boost::shared_ptr s) { boost::shared_ptr old = _midi_source.lock (); - + if (old) { old->invalidate (); } @@ -1796,7 +1821,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); } @@ -1815,7 +1840,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); } @@ -1856,7 +1881,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 @@ -1864,16 +1889,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); } @@ -1899,3 +1936,51 @@ MidiModel::insert_silence_at_start (TimeType t) apply_command_as_subcommand (s->session(), c); } } + +/** 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) +{ + boost::shared_ptr 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; + + } 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); + + } + } + + apply_command (s->session (), c); +} + +void +MidiModel::control_list_marked_dirty () +{ + AutomatableSequence::control_list_marked_dirty (); + + ContentsChanged (); /* EMIT SIGNAL */ +}