X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_model.cc;h=f64a5f6d0c6c62deac07dd08551effad8ec84818;hb=6c50971eba37d879f1b8690ee231bb412ee1cda6;hp=716d5117982a739627a6eef9b6b226a2f530aba4;hpb=b0e4f81eb3a38b7236ec39f11d5211840a064d15;p=ardour.git diff --git a/libs/ardour/midi_model.cc b/libs/ardour/midi_model.cc index 716d511798..f64a5f6d0c 100644 --- a/libs/ardour/midi_model.cc +++ b/libs/ardour/midi_model.cc @@ -195,11 +195,11 @@ MidiModel::NoteDiffCommand::change (const NotePtr note, Property prop, case StartTime: fatal << "MidiModel::DiffCommand::change() with integer argument called for start time" << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ break; case Length: fatal << "MidiModel::DiffCommand::change() with integer argument called for length" << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ break; } @@ -226,13 +226,13 @@ MidiModel::NoteDiffCommand::change (const NotePtr note, Property prop, break; case StartTime: - if (Evoral::musical_time_equal (note->time(), new_time)) { + if (note->time() == new_time) { return; } change.old_time = note->time(); break; case Length: - if (Evoral::musical_time_equal (note->length(), new_time)) { + if (note->length() == new_time) { return; } change.old_time = note->length(); @@ -556,7 +556,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) { @@ -564,7 +564,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) { @@ -627,7 +627,7 @@ MidiModel::NoteDiffCommand::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) { @@ -648,7 +648,7 @@ MidiModel::NoteDiffCommand::unmarshal_change (XMLNode *xml_change) } } else { fatal << "!!!" << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ } if ((prop = xml_change->property ("new")) != 0) { @@ -662,7 +662,7 @@ 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. @@ -899,7 +899,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) { @@ -914,7 +914,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) { @@ -922,7 +922,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. @@ -1252,8 +1252,8 @@ MidiModel::PatchChangePtr MidiModel::PatchChangeDiffCommand::unmarshal_patch_change (XMLNode* n) { XMLProperty* prop; - Evoral::event_id_t id; - Evoral::MusicalTime time = 0; + Evoral::event_id_t id = 0; + Evoral::MusicalTime time = Evoral::MusicalTime(); int channel = 0; int program = 0; int bank = 0; @@ -1284,6 +1284,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; } @@ -1425,25 +1426,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_lock); + source->mark_streaming_midi_write_started (source_lock, note_mode()); - source->drop_model(); - source->mark_streaming_midi_write_started (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); @@ -1456,7 +1455,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()); @@ -1464,16 +1463,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); @@ -1488,7 +1490,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; @@ -1496,13 +1501,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) { @@ -1525,22 +1527,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); @@ -1629,7 +1631,7 @@ MidiModel::edit_lock() assert (ms); Glib::Threads::Mutex::Lock* source_lock = new Glib::Threads::Mutex::Lock (ms->mutex()); - ms->invalidate(); // Release cached iterator's read lock on model + ms->invalidate(*source_lock); // Release cached iterator's read lock on model return WriteLock(new WriteLockImpl(source_lock, _lock, _control_lock)); } @@ -1661,7 +1663,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; @@ -1727,7 +1729,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; } @@ -1763,7 +1765,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; } @@ -1782,7 +1784,7 @@ MidiModel::resolve_overlaps_unlocked (const NotePtr note, void* arg) /* cannot add in this case */ return -1; default: - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ /* stupid gcc */ break; } @@ -1800,14 +1802,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; } @@ -1854,7 +1856,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 (); @@ -1978,7 +1981,7 @@ MidiModel::insert_silence_at_start (TimeType t) 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)); }