X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_ring_buffer.cc;h=df49b570c72adb4a7f4b530d9c10855633a81ed8;hb=b0e41486f3b68d2d5f803a761dc49a42c4599339;hp=746dc3b3eba04eae46cc2b103cda47dd5f34b4c6;hpb=9faf3bd048f48e34cd41e4ea8d8ca15e1446854b;p=ardour.git diff --git a/libs/ardour/midi_ring_buffer.cc b/libs/ardour/midi_ring_buffer.cc index 746dc3b3eb..df49b570c7 100644 --- a/libs/ardour/midi_ring_buffer.cc +++ b/libs/ardour/midi_ring_buffer.cc @@ -16,15 +16,17 @@ 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; -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. @@ -43,18 +45,18 @@ MidiRingBuffer::read(MidiBuffer& dst, nframes_t start, nframes_t end, nframes 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 event @ " << ev_time << " past end @ " << end << endl; + 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); @@ -66,8 +68,8 @@ MidiRingBuffer::read(MidiBuffer& dst, nframes_t start, nframes_t end, nframes // 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; - cerr << "MRB loop boundary @ " << ev_time << endl;*/ + 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 @@ -82,16 +84,12 @@ MidiRingBuffer::read(MidiBuffer& dst, nframes_t start, nframes_t end, nframes 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; + // 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; @@ -99,18 +97,22 @@ MidiRingBuffer::read(MidiBuffer& dst, nframes_t start, nframes_t end, nframes // 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"; continue; } - + // write MIDI buffer contents success = Evoral::EventRingBuffer::full_read(ev_size, write_loc); - - /*cerr << "wrote MidiEvent to Buffer: "; + +#ifndef NDEBUG + DEBUG_TRACE (DEBUG::MidiDiskstreamIO, "wrote MidiEvent to Buffer: "); for (size_t i=0; i < ev_size; ++i) { - printf("%X ", write_loc[i]); + DEBUG_STR_SET(a, hex); + DEBUG_STR(a) << "0x" << (int)write_loc[i] << ' '; + DEBUG_TRACE (DEBUG::MidiDiskstreamIO, DEBUG_STR(a).str()); } - printf("\n");*/ + DEBUG_TRACE (DEBUG::MidiDiskstreamIO, "\n"); +#endif if (success) { if (is_channel_event(status) && get_channel_mode() == ForceChannel) { @@ -121,11 +123,87 @@ MidiRingBuffer::read(MidiBuffer& dst, nframes_t start, nframes_t end, nframes cerr << "WARNING: error reading event contents from MIDI ring" << endl; } } - + return count; } +template +void +MidiRingBuffer::dump(ostream& str) +{ + size_t rspace; -template class MidiRingBuffer; + 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; + } -} // namespace ARDOUR + 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;