case Length:
return Variant(note->length());
}
+
+ return Variant();
+}
+
+Variant::Type
+MidiModel::NoteDiffCommand::value_type(Property prop)
+{
+ switch (prop) {
+ case NoteNumber:
+ case Velocity:
+ case Channel:
+ return Variant::INT;
+ case StartTime:
+ case Length:
+ return Variant::BEATS;
+ }
+
+ return Variant::NOTHING;
}
void
_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) {
assert (i->note);
}
}
-
+
for (ChangeList::iterator i = _changes.begin(); i != _changes.end(); ++i) {
Property prop = i->property;
_model->add_note_unlocked (*i);
}
}
-
+
_model->ContentsChanged(); /* EMIT SIGNAL */
}
}
ostringstream id_str;
- id_str << change.note->id();
- xml_change->add_property ("id", id_str.str());
+ if (change.note) {
+ id_str << change.note->id();
+ xml_change->add_property ("id", id_str.str());
+ } else if (change.note_id) {
+ warning << _("Change has no note, using note ID") << endmsg;
+ id_str << change.note_id;
+ xml_change->add_property ("id", id_str.str());
+ } else {
+ error << _("Change has no note or note ID") << endmsg;
+ }
return *xml_change;
}
{
XMLProperty* prop;
NoteChange change;
+ change.note_id = 0;
if ((prop = xml_change->property("property")) != 0) {
change.property = (Property) string_2_enum (prop->value(), change.property);
if ((prop = xml_change->property ("old")) != 0) {
istringstream old_str (prop->value());
if (change.property == StartTime || change.property == Length) {
- Evoral::MusicalTime old_time;
+ Evoral::Beats old_time;
old_str >> old_time;
change.old_value = old_time;
} else {
if ((prop = xml_change->property ("new")) != 0) {
istringstream new_str (prop->value());
if (change.property == StartTime || change.property == Length) {
- Evoral::MusicalTime new_time;
+ Evoral::Beats new_time;
new_str >> new_time;
change.new_value = Variant(new_time);
} else {
MidiModel::PatchChangeDiffCommand::unmarshal_patch_change (XMLNode* n)
{
XMLProperty* prop;
+ XMLProperty* prop_id;
Evoral::event_id_t id = 0;
- Evoral::MusicalTime time = Evoral::MusicalTime();
+ 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;
}
}
PatchChangePtr p (new Evoral::PatchChange<TimeType> (time, channel, program, bank));
- assert(id);
+ assert(prop_id);
p->set_id (id);
return p;
}
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).
*/
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) {
bool
MidiModel::write_section_to (boost::shared_ptr<MidiSource> source,
const Glib::Threads::Mutex::Lock& source_lock,
- Evoral::MusicalTime begin_time,
- Evoral::MusicalTime end_time)
+ Evoral::Beats begin_time,
+ Evoral::Beats end_time)
{
ReadLock lock(read_lock());
MidiStateTracker mst;
source->mark_streaming_midi_write_started (source_lock, note_mode());
for (Evoral::Sequence<TimeType>::const_iterator i = begin(TimeType(), true); i != end(); ++i) {
- const Evoral::Event<Evoral::MusicalTime>& ev (*i);
+ const Evoral::Event<Evoral::Beats>& ev (*i);
if (ev.time() >= begin_time && ev.time() < end_time) {
- const Evoral::MIDIEvent<Evoral::MusicalTime>* mev =
- static_cast<const Evoral::MIDIEvent<Evoral::MusicalTime>* > (&ev);
+ const Evoral::MIDIEvent<Evoral::Beats>* mev =
+ static_cast<const Evoral::MIDIEvent<Evoral::Beats>* > (&ev);
if (!mev) {
continue;
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
}
}
-/** 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"));
+ int new_note = note_ptr->note() + semitones;
- 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<Evoral::MusicalTime>::control_list_marked_dirty ();
-
+ AutomatableSequence<Evoral::Beats>::control_list_marked_dirty ();
+
ContentsChanged (); /* EMIT SIGNAL */
}