#include "evoral/EventSink.hpp"
#include "ardour/debug.h"
+#include "ardour/file_source.h"
+#include "ardour/midi_channel_filter.h"
#include "ardour/midi_model.h"
-#include "ardour/midi_state_tracker.h"
#include "ardour/midi_source.h"
-#include "ardour/file_source.h"
+#include "ardour/midi_state_tracker.h"
#include "ardour/session.h"
+#include "ardour/tempo.h"
#include "ardour/session_directory.h"
#include "ardour/source_factory.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
namespace ARDOUR { template <typename T> class MidiRingBuffer; }
int
MidiSource::set_state (const XMLNode& node, int /*version*/)
{
- const XMLProperty* prop;
+ XMLProperty const * prop;
if ((prop = node.property ("captured-for")) != 0) {
_captured_for = prop->value();
}
}
void
-MidiSource::invalidate (const Lock& lock)
+MidiSource::invalidate (const Lock& lock, std::set<Evoral::Sequence<Evoral::Beats>::WeakNotePtr>* notes)
{
_model_iter_valid = false;
- _model_iter.invalidate();
+ _model_iter.invalidate(notes);
}
framecnt_t
framepos_t start,
framecnt_t cnt,
MidiStateTracker* tracker,
- const std::set<Evoral::Parameter>& filtered) const
+ MidiChannelFilter* filter,
+ const std::set<Evoral::Parameter>& filtered,
+ double beat,
+ double start_beat) const
{
- BeatsFramesConverter converter(_session.tempo_map(), source_start);
+ //BeatsFramesConverter converter(_session.tempo_map(), source_start);
DEBUG_TRACE (DEBUG::MidiSourceIO,
string_compose ("MidiSource::midi_read() %5 sstart %1 start %2 cnt %3 tracker %4\n",
if (_model) {
// Find appropriate model iterator
- Evoral::Sequence<Evoral::MusicalTime>::const_iterator i = _model_iter;
- if (_last_read_end == 0 || start != _last_read_end || !_model_iter_valid) {
+ Evoral::Sequence<Evoral::Beats>::const_iterator& i = _model_iter;
+ const bool linear_read = _last_read_end != 0 && start == _last_read_end;
+ if (!linear_read || !_model_iter_valid) {
+#if 0
// Cached iterator is invalid, search for the first event past start
- i = _model->begin(converter.from(start), false, filtered);
+ 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();
+ }
+#else
+ /* hot-fix http://tracker.ardour.org/view.php?id=6541
+ * "parallel playback of linked midi regions -> no note-offs"
+ *
+ * A midi source can be used by multiple tracks simultaneously,
+ * in which case midi_read() may be called from different tracks for
+ * overlapping time-ranges.
+ *
+ * However there is only a single iterator for a given midi-source.
+ * This results in every midi_read() performing a seek.
+ *
+ * If seeking is performed with
+ * _model->begin(converter.from(start),...)
+ * the model is used for seeking. That method seeks to the first
+ * *note-on* event after 'start'.
+ *
+ * _model->begin(converter.from( ) ,..) eventually calls
+ * Sequence<Time>::const_iterator() in libs/evoral/src/Sequence.cpp
+ * which looks up the note-event via seq.note_lower_bound(t);
+ * but the sequence 'seq' only contains note-on events(!).
+ * note-off events are implicit in Sequence<Time>::operator++()
+ * via _active_notes.pop(); and not part of seq.
+ *
+ * see also http://tracker.ardour.org/view.php?id=6287#c16671
+ *
+ * The linear search below assures that reading starts at the first
+ * event for the given time, regardless of its event-type.
+ *
+ * The performance of this approach is O(N), while the previous
+ * implementation is O(log(N)). This needs to be optimized:
+ * The model-iterator or event-sequence needs to be re-designed in
+ * some way (maybe keep an iterator per playlist).
+ */
+ for (i = _model->begin(); i != _model->end(); ++i) {
+ if (i->time().to_double() + (beat - start_beat) >= beat) {
+ break;
+ }
+ }
+ _model_iter_valid = true;
+ if (!linear_read) {
+ _model->active_notes().clear();
+ }
+#endif
}
_last_read_end = start + cnt;
// 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) {
+ const framecnt_t time_frames = _session.tempo_map().frame_at_beat (i->time().to_double() + (beat - start_beat));
+
+ if (time_frames < start + cnt + source_start) {
+ 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, i->event_type(), i->size()));
+ 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());
+ dst.write (time_frames, i->event_type(), i->size(), i->buffer());
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()));
+ _name, time_frames, i->event_type(), i->size()));
if (tracker) {
tracker->track (*i);
break;
}
}
- _model_iter = i;
- _model_iter_valid = true;
return cnt;
} else {
- return read_unlocked (lm, dst, source_start, start, cnt, tracker);
+ return read_unlocked (lm, dst, source_start, start, cnt, tracker, filter);
}
}
}
void
-MidiSource::mark_midi_streaming_write_completed (const Lock& lock,
- Evoral::Sequence<Evoral::MusicalTime>::StuckNoteOption option,
- Evoral::MusicalTime end)
+MidiSource::mark_midi_streaming_write_completed (const Lock& lock,
+ Evoral::Sequence<Evoral::Beats>::StuckNoteOption option,
+ Evoral::Beats end)
{
if (_model) {
_model->end_write (option, end);
}
}
+ invalidate(lock);
_writing = false;
}
void
MidiSource::mark_streaming_write_completed (const Lock& lock)
{
- mark_midi_streaming_write_completed (lock, Evoral::Sequence<Evoral::MusicalTime>::DeleteStuckNotes);
+ mark_midi_streaming_write_completed (lock, Evoral::Sequence<Evoral::Beats>::DeleteStuckNotes);
}
int
-MidiSource::write_to (const Lock& lock, boost::shared_ptr<MidiSource> newsrc, Evoral::MusicalTime begin, Evoral::MusicalTime end)
+MidiSource::write_to (const Lock& lock, boost::shared_ptr<MidiSource> newsrc, Evoral::Beats begin, Evoral::Beats end)
{
Lock newsrc_lock (newsrc->mutex ());
newsrc->copy_automation_state_from (this);
if (_model) {
- if (begin == Evoral::MinMusicalTime && end == Evoral::MaxMusicalTime) {
+ if (begin == Evoral::MinBeats && end == Evoral::MaxBeats) {
_model->write_to (newsrc, newsrc_lock);
} else {
_model->write_section_to (newsrc, newsrc_lock, begin, end);
/* force a reload of the model if the range is partial */
- if (begin != Evoral::MinMusicalTime || end != Evoral::MaxMusicalTime) {
+ if (begin != Evoral::MinBeats || end != Evoral::MaxBeats) {
newsrc->load_model (newsrc_lock, true);
} else {
newsrc->set_model (newsrc_lock, _model);
projects / ardour.git / blobdiff