#include "ardour/midi_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();
}
framecnt_t cnt,
MidiStateTracker* tracker,
MidiChannelFilter* filter,
- const std::set<Evoral::Parameter>& filtered) const
+ 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",
* "parallel playback of linked midi regions -> no note-offs"
*
* A midi source can be used by multiple tracks simultaneously,
- * in which case midi_read() can called from different tracks for
+ * 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.
+ * This results in every midi_read() performing a seek.
*
- * if seeking is performed with
+ * 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(conveter.from( ) ,..) eventually calls
+ * _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(!).
* via _active_notes.pop(); and not part of seq.
*
* see also http://tracker.ardour.org/view.php?id=6287#c16671
- * and call 1-900-ardour-midi ($4.99/min)
*
* 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) {
- const framecnt_t time_frames = converter.to(i->time());
- if (time_frames >= start) {
+ if (i->time().to_double() + (beat - start_beat) >= beat) {
break;
}
}
_model_iter_valid = true;
+ if (!linear_read) {
+ _model->active_notes().clear();
+ }
#endif
}
// 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 + source_start, i->event_type(), i->size()));
+ _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);