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;
-
-namespace ARDOUR {
+using namespace ARDOUR;
+using namespace PBD;
/** Read a block of MIDI events from buffer into a MidiBuffer.
*
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 event @ " << ev_time << " past end @ " << 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 event @ " << ev_time << " before start @ " << start << 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);
if (ev_type == LoopEventType) {
/*ev_time -= start;
ev_time += offset;*/
- // cerr << "MRB loop boundary @ " << ev_time << endl;
+ 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
continue;
}
}
-
+
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";
+ cerr << "MRB: Unable to reserve space in buffer, event skipped";
+ this->skip (ev_size); // Advance read pointer to next event
continue;
}
-
+
// write MIDI buffer contents
- success = Evoral::EventRingBuffer<T>::full_read(ev_size, write_loc);
-
-#if 0
- cerr << "wrote MidiEvent to Buffer: " << hex;
+ 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) {
- cerr << (int) write_loc[i] << ' ';
+ DEBUG_STR_APPEND(a,hex);
+ DEBUG_STR_APPEND(a,"0x");
+ DEBUG_STR_APPEND(a,(int)write_loc[i]);
+ DEBUG_STR_APPEND(a,' ');
}
- cerr << dec << endl;
+ DEBUG_STR_APPEND(a,'\n');
+ DEBUG_TRACE (DEBUG::MidiDiskstreamIO, DEBUG_STR(a).str());
#endif
if (success) {
cerr << "WARNING: error reading event contents from MIDI ring" << endl;
}
}
-
+
return count;
}
template<typename T>
void
-MidiRingBuffer<T>::dump(ostream& str)
+MidiRingBuffer<T>::dump(ostream& str)
{
size_t rspace;
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));
+ memcpy (&ev_time, wp, sizeof (T));
read_ptr = (read_ptr + sizeof (T)) % this->_size;
str << "time " << ev_time;
}
wp = &this->_buf[read_ptr];
- memcpy (&ev_type, wp, sizeof (ev_type));
+ memcpy (&ev_type, wp, sizeof (ev_type));
read_ptr = (read_ptr + sizeof (ev_type)) % this->_size;
str << " type " << ev_type;
}
wp = &this->_buf[read_ptr];
- memcpy (&ev_size, wp, sizeof (ev_size));
+ memcpy (&ev_size, wp, sizeof (ev_size));
read_ptr = (read_ptr + sizeof (ev_size)) % this->_size;
str << " size " << ev_size;
str << "!OUT!\n";
break;
}
-
+
data = new uint8_t[ev_size];
-
+
wp = &this->_buf[read_ptr];
- memcpy (data, wp, ev_size);
+ memcpy (data, wp, ev_size);
read_ptr = (read_ptr + ev_size) % this->_size;
for (uint32_t i = 0; i != ev_size; ++i) {
template class MidiRingBuffer<nframes_t>;
-} // namespace ARDOUR
-