Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include "pbd/compose.h"
+
+#include "ardour/debug.h"
#include "ardour/midi_ring_buffer.h"
#include "ardour/midi_buffer.h"
#include "ardour/event_type_map.h"
using namespace std;
+using namespace ARDOUR;
+using namespace PBD;
-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.
size_t count = 0;
- //cerr << "MRB read " << start << " .. " << end << " + " << offset << endl;
-
while (this->read_space() >= sizeof(T) + sizeof(Evoral::EventType) + sizeof(uint32_t)) {
this->full_peek(sizeof(T), (uint8_t*)&ev_time);
- if (ev_time > end) {
- //cerr << "MRB: PAST END (" << ev_time << " : " << end << ")" << endl;
+ if (ev_time >= end) {
+ DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose ("MRB event @ %1 past end @ %2\n", ev_time, end));
break;
} else if (ev_time < start) {
- //cerr << "MRB (start " << start << ") - Skipping event at (too early) time " << ev_time << endl;
+ DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose ("MRB event @ %1 before start @ %2\n", ev_time, start));
break;
+ } else {
+ DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose ("MRB event @ %1 in range %2 .. %3\n", ev_time, start, end));
}
bool success = read_prefix(&ev_time, &ev_type, &ev_size);
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 += 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.
+ /*ev_time -= start;
+ ev_time += offset;*/
+ 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)) ) {
- //cerr << "MRB skipping event due to channel mask" << endl;
+ 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;
-
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) {
cerr << "MRB: Unable to reserve space in buffer, event skipped";
+ this->skip (ev_size); // Advance read pointer to next event
continue;
}
- success = Evoral::EventRingBuffer<T>::full_read(ev_size, write_loc);
+ // write MIDI buffer contents
+ success = read_contents (ev_size, write_loc);
+
+#ifndef NDEBUG
+ DEBUG_STR_DECL(a);
+ DEBUG_STR_APPEND(a, string_compose ("wrote MidiEvent to Buffer (time=%1, start=%2 offset=%3)", ev_time, start, offset));
+ for (size_t i=0; i < ev_size; ++i) {
+ DEBUG_STR_APPEND(a,hex);
+ DEBUG_STR_APPEND(a,"0x");
+ DEBUG_STR_APPEND(a,(int)write_loc[i]);
+ DEBUG_STR_APPEND(a,' ');
+ }
+ DEBUG_STR_APPEND(a,'\n');
+ DEBUG_TRACE (DEBUG::MidiDiskstreamIO, DEBUG_STR(a).str());
+#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<typename T>
+void
+MidiRingBuffer<T>::dump(ostream& str)
+{
+ size_t rspace;
+
+ if ((rspace = this->read_space()) == 0) {
+ str << "MRB::dump: empty\n";
+ return;
+ }
+
+ T ev_time;
+ Evoral::EventType ev_type;
+ uint32_t ev_size;
+ size_t read_ptr = g_atomic_int_get (&this->_read_ptr);
+
+ str << "Dump @ " << read_ptr << endl;
+
+ while (1) {
+ uint8_t* wp;
+ uint8_t* data;
+ size_t write_ptr;
+
+#define space(r,w) ((w > r) ? (w - r) : ((w - r + this->_size) % this->_size))
+
+ write_ptr = g_atomic_int_get (&this->_write_ptr);
+ if (space (read_ptr, write_ptr) < sizeof (T)) {
+ break;
+ }
+
+ wp = &this->_buf[read_ptr];
+ memcpy (&ev_time, wp, sizeof (T));
+ read_ptr = (read_ptr + sizeof (T)) % this->_size;
+ str << "time " << ev_time;
+
+ write_ptr = g_atomic_int_get (&this->_write_ptr);
+ if (space (read_ptr, write_ptr) < sizeof (ev_type)) {
+ break;
+ }
+
+ wp = &this->_buf[read_ptr];
+ memcpy (&ev_type, wp, sizeof (ev_type));
+ read_ptr = (read_ptr + sizeof (ev_type)) % this->_size;
+ str << " type " << ev_type;
+
+ write_ptr = g_atomic_int_get (&this->_write_ptr);
+ if (space (read_ptr, write_ptr) < sizeof (ev_size)) {
+ str << "!OUT!\n";
+ break;
+ }
+
+ wp = &this->_buf[read_ptr];
+ memcpy (&ev_size, wp, sizeof (ev_size));
+ read_ptr = (read_ptr + sizeof (ev_size)) % this->_size;
+ str << " size " << ev_size;
+
+ write_ptr = g_atomic_int_get (&this->_write_ptr);
+ if (space (read_ptr, write_ptr) < ev_size) {
+ str << "!OUT!\n";
+ break;
+ }
+
+ data = new uint8_t[ev_size];
+
+ wp = &this->_buf[read_ptr];
+ memcpy (data, wp, ev_size);
+ read_ptr = (read_ptr + ev_size) % this->_size;
+
+ for (uint32_t i = 0; i != ev_size; ++i) {
+ str << ' ' << hex << (int) data[i] << dec;
+ }
+
+ str << endl;
+
+ delete [] data;
+ }
+}
-template class MidiRingBuffer<double>;
-} // namespace ARDOUR
+template class MidiRingBuffer<nframes_t>;
projects / ardour.git / blobdiff