namespace ARDOUR {
-/** Read a block of MIDI events from buffer.
+/** Read a block of MIDI events from buffer into a MidiBuffer.
*
* Timestamps of events returned are relative to start (i.e. event with stamp 0
* occurred at start), with offset added.
this->full_peek(sizeof(T), (uint8_t*)&ev_time);
if (ev_time > end) {
- //cerr << "MRB: PAST END (" << ev_time << " : " << end << ")" << endl;
+ //cerr << "MRB event @ " << ev_time << " past end @ " << end << endl;
break;
} else if (ev_time < start) {
- //cerr << "MRB (start " << start << ") - Skipping event at (too early) time " << ev_time << endl;
+ //cerr << "MRB event @ " << ev_time << " before start @ " << start << endl;
break;
}
continue;
}
- // This event marks a loop happening. this means that
- // the next events timestamp will be non-monotonic.
+ // This event marks a loop end (i.e. the next event's timestamp will be non-monotonic)
if (ev_type == LoopEventType) {
- ev_time -= start;
+ /*ev_time -= start;
ev_time += offset;
- Evoral::MIDIEvent<T> loopevent(LoopEventType, ev_time);
- dst.push_back(loopevent);
-
- // We can safely return, without reading the data, because
- // a LoopEvent does not have data.
+ cerr << "MRB loop boundary @ " << ev_time << endl;*/
+
+ // Return without reading data or writing to buffer (loop events have no data)
+ // FIXME: This is not correct, loses events after the loop this cycle
return count + 1;
}
// Ignore event if it doesn't match channel filter
if (is_channel_event(status) && get_channel_mode() == FilterChannels) {
const uint8_t channel = status & 0x0F;
- if ( !(get_channel_mask() & (1L << channel)) ) {
+ if (!(get_channel_mask() & (1L << channel))) {
//cerr << "MRB skipping event due to channel mask" << endl;
this->skip(ev_size); // Advance read pointer to next event
continue;
}
}
- //cerr << "MRB " << this << " - Reading event, time = "
- // << ev_time << " - " << start << " => " << ev_time - start
- // << ", size = " << ev_size << endl;
+ /*cerr << "MRB " << this << " - Reading event, time = "
+ << ev_time << " - " << start << " => " << ev_time - start
+ << ", size = " << ev_size << endl;*/
assert(ev_time >= start);
ev_time -= start;
ev_time += offset;
- // this writes the timestamp to address (write_loc - 1)
+ // write the timestamp to address (write_loc - 1)
uint8_t* write_loc = dst.reserve(ev_time, ev_size);
if (write_loc == NULL) {
cerr << "MRB: Unable to reserve space in buffer, event skipped";
// write MIDI buffer contents
success = Evoral::EventRingBuffer<T>::full_read(ev_size, write_loc);
- cerr << "wrote MidiEvent to Buffer: ";
+#if 0
+ cerr << "wrote MidiEvent to Buffer: " << hex;
for (size_t i=0; i < ev_size; ++i) {
- printf("%X ", write_loc[i]);
+ cerr << (int) write_loc[i] << ' ';
}
- printf("\n");
-
+ cerr << dec << endl;
+#endif
if (success) {
if (is_channel_event(status) && get_channel_mode() == ForceChannel) {
write_loc[0] = (write_loc[0] & 0xF0) | (get_channel_mask() & 0x0F);
}
++count;
- //cerr << "MRB - read event at time " << ev_time << endl;
} else {
cerr << "WARNING: error reading event contents from MIDI ring" << endl;
}
}
- //cerr << "MTB read space: " << read_space() << endl;
-
return count;
}
-template class MidiRingBuffer<double>;
+template class MidiRingBuffer<nframes_t>;
} // namespace ARDOUR