X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_source.cc;h=ea0bd15b0c3a78caa3b059bff3565dfe79ddfc7d;hb=a1b4f9b8abf2887b17bce05403ea7eab2421f26a;hp=ab972fabd872222b329ae762aa92044b1dc168b1;hpb=ced4378d0914bcfb926267772c45d1d23f3bed38;p=ardour.git diff --git a/libs/ardour/midi_source.cc b/libs/ardour/midi_source.cc index ab972fabd8..ea0bd15b0c 100644 --- a/libs/ardour/midi_source.cc +++ b/libs/ardour/midi_source.cc @@ -40,14 +40,16 @@ #include "ardour/debug.h" #include "ardour/file_source.h" #include "ardour/midi_channel_filter.h" +#include "ardour/midi_cursor.h" #include "ardour/midi_model.h" #include "ardour/midi_source.h" #include "ardour/midi_state_tracker.h" #include "ardour/session.h" #include "ardour/session_directory.h" #include "ardour/source_factory.h" +#include "ardour/tempo.h" -#include "i18n.h" +#include "pbd/i18n.h" namespace ARDOUR { template class MidiRingBuffer; } @@ -55,14 +57,10 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -PBD::Signal1 MidiSource::MidiSourceCreated; - MidiSource::MidiSource (Session& s, string name, Source::Flag flags) : Source(s, DataType::MIDI, name, flags) , _writing(false) - , _model_iter_valid(false) , _length_beats(0.0) - , _last_read_end(0) , _capture_length(0) , _capture_loop_length(0) { @@ -71,9 +69,7 @@ MidiSource::MidiSource (Session& s, string name, Source::Flag flags) MidiSource::MidiSource (Session& s, const XMLNode& node) : Source(s, node) , _writing(false) - , _model_iter_valid(false) , _length_beats(0.0) - , _last_read_end(0) , _capture_length(0) , _capture_loop_length(0) { @@ -84,6 +80,8 @@ MidiSource::MidiSource (Session& s, const XMLNode& node) MidiSource::~MidiSource () { + /* invalidate any existing iterators */ + Invalidated (false); } XMLNode& @@ -92,19 +90,19 @@ MidiSource::get_state () XMLNode& node (Source::get_state()); if (_captured_for.length()) { - node.add_property ("captured-for", _captured_for); + node.set_property ("captured-for", _captured_for); } for (InterpolationStyleMap::const_iterator i = _interpolation_style.begin(); i != _interpolation_style.end(); ++i) { XMLNode* child = node.add_child (X_("InterpolationStyle")); - child->add_property (X_("parameter"), EventTypeMap::instance().to_symbol (i->first)); - child->add_property (X_("style"), enum_2_string (i->second)); + child->set_property (X_("parameter"), EventTypeMap::instance().to_symbol (i->first)); + child->set_property (X_("style"), enum_2_string (i->second)); } for (AutomationStateMap::const_iterator i = _automation_state.begin(); i != _automation_state.end(); ++i) { XMLNode* child = node.add_child (X_("AutomationState")); - child->add_property (X_("parameter"), EventTypeMap::instance().to_symbol (i->first)); - child->add_property (X_("state"), enum_2_string (i->second)); + child->set_property (X_("parameter"), EventTypeMap::instance().to_symbol (i->first)); + child->set_property (X_("state"), enum_2_string (i->second)); } return node; @@ -113,40 +111,38 @@ MidiSource::get_state () int MidiSource::set_state (const XMLNode& node, int /*version*/) { - const XMLProperty* prop; - if ((prop = node.property ("captured-for")) != 0) { - _captured_for = prop->value(); - } + node.get_property ("captured-for", _captured_for); + std::string str; XMLNodeList children = node.children (); for (XMLNodeConstIterator i = children.begin(); i != children.end(); ++i) { if ((*i)->name() == X_("InterpolationStyle")) { - if ((prop = (*i)->property (X_("parameter"))) == 0) { + if (!(*i)->get_property (X_("parameter"), str)) { error << _("Missing parameter property on InterpolationStyle") << endmsg; return -1; } - Evoral::Parameter p = EventTypeMap::instance().from_symbol (prop->value()); + Evoral::Parameter p = EventTypeMap::instance().from_symbol (str); - if ((prop = (*i)->property (X_("style"))) == 0) { + if (!(*i)->get_property (X_("style"), str)) { error << _("Missing style property on InterpolationStyle") << endmsg; return -1; } - Evoral::ControlList::InterpolationStyle s = static_cast( - string_2_enum (prop->value(), s)); + Evoral::ControlList::InterpolationStyle s = + static_cast(string_2_enum (str, s)); set_interpolation_of (p, s); } else if ((*i)->name() == X_("AutomationState")) { - if ((prop = (*i)->property (X_("parameter"))) == 0) { + if (!(*i)->get_property (X_("parameter"), str)) { error << _("Missing parameter property on AutomationState") << endmsg; return -1; } - Evoral::Parameter p = EventTypeMap::instance().from_symbol (prop->value()); + Evoral::Parameter p = EventTypeMap::instance().from_symbol (str); - if ((prop = (*i)->property (X_("state"))) == 0) { + if (!(*i)->get_property (X_("state"), str)) { error << _("Missing state property on AutomationState") << endmsg; return -1; } - AutoState s = static_cast (string_2_enum (prop->value(), s)); + AutoState s = static_cast(string_2_enum (str, s)); set_automation_state_of (p, s); } } @@ -178,10 +174,9 @@ MidiSource::update_length (framecnt_t) } void -MidiSource::invalidate (const Lock& lock, std::set::WeakNotePtr>* notes) +MidiSource::invalidate (const Lock& lock) { - _model_iter_valid = false; - _model_iter.invalidate(notes); + Invalidated(_session.transport_rolling()); } framecnt_t @@ -190,64 +185,113 @@ MidiSource::midi_read (const Lock& lm, framepos_t source_start, framepos_t start, framecnt_t cnt, + Evoral::Range* loop_range, + MidiCursor& cursor, MidiStateTracker* tracker, MidiChannelFilter* filter, - const std::set& filtered) const + const std::set& filtered, + const double pos_beats, + const double start_beats) const { BeatsFramesConverter converter(_session.tempo_map(), source_start); + const double start_qn = pos_beats - start_beats; + DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("MidiSource::midi_read() %5 sstart %1 start %2 cnt %3 tracker %4\n", source_start, start, cnt, tracker, name())); - if (_model) { - // Find appropriate model iterator - Evoral::Sequence::const_iterator& i = _model_iter; - const bool linear_read = _last_read_end != 0 && start == _last_read_end; - if (!linear_read || !_model_iter_valid) { - // Cached iterator is invalid, search for the first event past start - i = _model->begin(converter.from(start), false, filtered, - linear_read ? &_model->active_notes() : NULL); - _model_iter_valid = true; - if (!linear_read) { - _model->active_notes().clear(); - } - } + if (!_model) { + return read_unlocked (lm, dst, source_start, start, cnt, loop_range, tracker, filter); + } - _last_read_end = start + cnt; + // Find appropriate model iterator + Evoral::Sequence::const_iterator& i = cursor.iter; + const bool linear_read = cursor.last_read_end != 0 && start == cursor.last_read_end; + if (!linear_read || !i.valid()) { + /* Cached iterator is invalid, search for the first event past start. + Note that multiple tracks can use a MidiSource simultaneously, so + all playback state must be in parameters (the cursor) and must not + be cached in the source of model itself. + See http://tracker.ardour.org/view.php?id=6541 + */ + cursor.connect(Invalidated); + cursor.iter = _model->begin(converter.from(start), false, filtered, &cursor.active_notes); + cursor.active_notes.clear(); + } - // Copy events in [start, start + cnt) into dst - for (; i != _model->end(); ++i) { - const framecnt_t time_frames = converter.to(i->time()); - if (time_frames < start + cnt) { - if (filter && filter->filter(i->buffer(), i->size())) { - DEBUG_TRACE (DEBUG::MidiSourceIO, - string_compose ("%1: filter event @ %2 type %3 size %4\n", - _name, time_frames + source_start, i->event_type(), i->size())); - continue; - } + cursor.last_read_end = start + cnt; + + // Copy events in [start, start + cnt) into dst + for (; i != _model->end(); ++i) { + + // Offset by source start to convert event time to session time + + framepos_t time_frames = _session.tempo_map().frame_at_quarter_note (i->time().to_double() + start_qn); + + if (time_frames < start + source_start) { + /* event too early */ + + continue; - // Offset by source start to convert event time to session time - dst.write (time_frames + source_start, i->event_type(), i->size(), i->buffer()); + } else if (time_frames >= start + cnt + source_start) { - DEBUG_TRACE (DEBUG::MidiSourceIO, - string_compose ("%1: add event @ %2 type %3 size %4\n", - _name, time_frames + source_start, i->event_type(), i->size())); + DEBUG_TRACE (DEBUG::MidiSourceIO, + string_compose ("%1: reached end with event @ %2 vs. %3\n", + _name, time_frames, start+cnt)); + break; + + } else { + + /* in range */ + + if (loop_range) { + time_frames = loop_range->squish (time_frames); + } - if (tracker) { - tracker->track (*i); + const uint8_t status = i->buffer()[0]; + const bool is_channel_event = (0x80 <= (status & 0xF0)) && (status <= 0xE0); + if (filter && is_channel_event) { + /* Copy event so the filter can modify the channel. I'm not + sure if this is necessary here (channels are mapped later in + buffers anyway), but it preserves existing behaviour without + destroying events in the model during read. */ + Evoral::Event ev(*i, true); + if (!filter->filter(ev.buffer(), ev.size())) { + dst.write(time_frames, ev.event_type(), ev.size(), ev.buffer()); + } else { + DEBUG_TRACE (DEBUG::MidiSourceIO, + string_compose ("%1: filter event @ %2 type %3 size %4\n", + _name, time_frames, i->event_type(), i->size())); } } else { - DEBUG_TRACE (DEBUG::MidiSourceIO, - string_compose ("%1: reached end with event @ %2 vs. %3\n", - _name, time_frames, start+cnt)); - break; + dst.write (time_frames, i->event_type(), i->size(), i->buffer()); + } + +#ifndef NDEBUG + if (DEBUG_ENABLED(DEBUG::MidiSourceIO)) { + DEBUG_STR_DECL(a); + DEBUG_STR_APPEND(a, string_compose ("%1 added event @ %2 sz %3 within %4 .. %5 ", + _name, time_frames, i->size(), + start + source_start, start + cnt + source_start)); + for (size_t n=0; n < i->size(); ++n) { + DEBUG_STR_APPEND(a,hex); + DEBUG_STR_APPEND(a,"0x"); + DEBUG_STR_APPEND(a,(int)i->buffer()[n]); + DEBUG_STR_APPEND(a,' '); + } + DEBUG_STR_APPEND(a,'\n'); + DEBUG_TRACE (DEBUG::MidiSourceIO, DEBUG_STR(a).str()); + } +#endif + + if (tracker) { + tracker->track (*i); } } - return cnt; - } else { - return read_unlocked (lm, dst, source_start, start, cnt, tracker, filter); } + + return cnt; } framecnt_t @@ -259,7 +303,6 @@ MidiSource::midi_write (const Lock& lm, const framecnt_t ret = write_unlocked (lm, source, source_start, cnt); if (cnt == max_framecnt) { - _last_read_end = 0; invalidate(lm); } else { _capture_length += cnt; @@ -299,7 +342,8 @@ MidiSource::mark_write_starting_now (framecnt_t position, _capture_length = capture_length; _capture_loop_length = loop_length; - BeatsFramesConverter converter(_session.tempo_map(), position); + TempoMap& map (_session.tempo_map()); + BeatsFramesConverter converter(map, position); _length_beats = converter.from(capture_length); } @@ -337,6 +381,23 @@ MidiSource::mark_streaming_write_completed (const Lock& lock) mark_midi_streaming_write_completed (lock, Evoral::Sequence::DeleteStuckNotes); } +int +MidiSource::export_write_to (const Lock& lock, boost::shared_ptr newsrc, Evoral::Beats begin, Evoral::Beats end) +{ + Lock newsrc_lock (newsrc->mutex ()); + + if (!_model) { + error << string_compose (_("programming error: %1"), X_("no model for MidiSource during export")); + return -1; + } + + _model->write_section_to (newsrc, newsrc_lock, begin, end, true); + + newsrc->flush_midi(newsrc_lock); + + return 0; +} + int MidiSource::write_to (const Lock& lock, boost::shared_ptr newsrc, Evoral::Beats begin, Evoral::Beats end) {