#include "ardour/midi_buffer.h"
#include "ardour/event_type_map.h"
+using namespace std;
+
namespace ARDOUR {
/** Read a block of MIDI events from buffer.
* Timestamps of events returned are relative to start (i.e. event with stamp 0
* occurred at start), with offset added.
*/
+template<typename T>
size_t
-MidiRingBuffer::read(MidiBuffer& dst, nframes_t start, nframes_t end, nframes_t offset)
+MidiRingBuffer<T>::read(MidiBuffer& dst, nframes_t start, nframes_t end, nframes_t offset)
{
- if (read_space() == 0) {
- //std::cerr << "MRB: NO READ SPACE" << std::endl;
+ if (this->read_space() == 0) {
return 0;
}
- Evoral::EventTime ev_time;
+ T ev_time;
Evoral::EventType ev_type;
uint32_t ev_size;
size_t count = 0;
- //std::cerr << "MRB read " << start << " .. " << end << " + " << offset << std::endl;
+ //cerr << "MRB read " << start << " .. " << end << " + " << offset << endl;
- while (read_space() >= sizeof(Evoral::EventTime) + sizeof(Evoral::EventType) + sizeof(uint32_t)) {
+ while (this->read_space() >= sizeof(T) + sizeof(Evoral::EventType) + sizeof(uint32_t)) {
- full_peek(sizeof(Evoral::EventTime), (uint8_t*)&ev_time);
+ this->full_peek(sizeof(T), (uint8_t*)&ev_time);
if (ev_time > end) {
- //std::cerr << "MRB: PAST END (" << ev_time << " : " << end << ")" << std::endl;
+ //cerr << "MRB event @ " << ev_time << " past end @ " << end << endl;
break;
} else if (ev_time < start) {
- //std::cerr << "MRB (start " << start << ") - Skipping event at (too early) time " << ev_time << std::endl;
+ //cerr << "MRB event @ " << ev_time << " before start @ " << start << endl;
break;
}
bool success = read_prefix(&ev_time, &ev_type, &ev_size);
if (!success) {
- std::cerr << "WARNING: error reading event prefix from MIDI ring" << std::endl;
+ cerr << "WARNING: error reading event prefix from MIDI ring" << endl;
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 loopevent(LoopEventType, ev_time);
- dst.push_back(loopevent);
+ cerr << "MRB loop boundary @ " << ev_time << endl;*/
-
- // We can safely return, without reading the data, because
- // a LoopEvent does not have data.
+ // 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;
}
uint8_t status;
- success = full_peek(sizeof(uint8_t), &status);
+ success = this->full_peek(sizeof(uint8_t), &status);
assert(success); // If this failed, buffer is corrupt, all hope is lost
// 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)) ) {
- //std::cerr << "MRB skipping event due to channel mask" << std::endl;
- skip(ev_size); // Advance read pointer to next event
+ 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;
}
}
- //std::cerr << "MRB " << this << " - Reading event, time = "
- // << ev_time << " - " << start << " => " << ev_time - start
- // << ", size = " << ev_size << std::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;
+ // write the timestamp to address (write_loc - 1)
uint8_t* write_loc = dst.reserve(ev_time, ev_size);
if (write_loc == NULL) {
- //std::cerr << "MRB: Unable to reserve space in buffer, event skipped";
+ cerr << "MRB: Unable to reserve space in buffer, event skipped";
continue;
}
-
- success = Evoral::EventRingBuffer::full_read(ev_size, write_loc);
+
+ // write MIDI buffer contents
+ success = Evoral::EventRingBuffer<T>::full_read(ev_size, write_loc);
+
+ /*cerr << "wrote MidiEvent to Buffer: ";
+ for (size_t i=0; i < ev_size; ++i) {
+ printf("%X ", write_loc[i]);
+ }
+ printf("\n");*/
if (success) {
if (is_channel_event(status) && get_channel_mode() == ForceChannel) {
write_loc[0] = (write_loc[0] & 0xF0) | (get_channel_mask() & 0x0F);
}
++count;
- //std::cerr << "MRB - read event at time " << ev_time << std::endl;
} else {
- std::cerr << "WARNING: error reading event contents from MIDI ring" << std::endl;
+ cerr << "WARNING: error reading event contents from MIDI ring" << endl;
}
}
- //std::cerr << "MTB read space: " << read_space() << std::endl;
-
return count;
}
+template class MidiRingBuffer<nframes_t>;
} // namespace ARDOUR
projects / ardour.git / blobdiff