X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_ring_buffer.cc;h=e4ae3f3ffe5e9b210f0df544d34b0c6f1e8a66d9;hb=456fb789d3adcdb52de3abd863c1bf64c973effa;hp=df49b570c72adb4a7f4b530d9c10855633a81ed8;hpb=de5e463904de7b58218a5bb1e9080ba5353bb985;p=ardour.git

diff --git a/libs/ardour/midi_ring_buffer.cc b/libs/ardour/midi_ring_buffer.cc
index df49b570c7..e4ae3f3ffe 100644
--- a/libs/ardour/midi_ring_buffer.cc
+++ b/libs/ardour/midi_ring_buffer.cc
@@ -17,6 +17,8 @@
 */
 
 #include "pbd/compose.h"
+#include "pbd/enumwriter.h"
+#include "pbd/error.h"
 
 #include "ardour/debug.h"
 #include "ardour/midi_ring_buffer.h"
@@ -24,32 +26,41 @@
 #include "ardour/event_type_map.h"
 
 using namespace std;
-using namespace ARDOUR;
+using namespace PBD;
 
-/** Read a block of MIDI events from buffer into a MidiBuffer.
+namespace ARDOUR {
+
+/** Read a block of MIDI events from this buffer into a MidiBuffer.
  *
  * 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<T>::read(MidiBuffer& dst, nframes_t start, nframes_t end, nframes_t offset)
+MidiRingBuffer<T>::read(MidiBuffer& dst, framepos_t start, framepos_t end, framecnt_t offset, bool stop_on_overflow_in_dst)
 {
 	if (this->read_space() == 0) {
 		return 0;
 	}
 
 	T                 ev_time;
-	Evoral::EventType ev_type;
 	uint32_t          ev_size;
+	size_t            count = 0;
+	const size_t      prefix_size = sizeof(T) + sizeof(Evoral::EventType) + sizeof(uint32_t);
 
-	size_t count = 0;
+	while (this->read_space() >= prefix_size) {
 
-	while (this->read_space() >= sizeof(T) + sizeof(Evoral::EventType) + sizeof(uint32_t)) {
+		uint8_t peekbuf[prefix_size];
 
-		this->full_peek(sizeof(T), (uint8_t*)&ev_time);
+		/* this cannot fail, because we've already verified that there
+		   is prefix_space to read
+		*/
+		this->peek (peekbuf, prefix_size);
 
-		if (ev_time > end) {
+		ev_time = *((T*) peekbuf);
+		ev_size = *((uint32_t*)(peekbuf + sizeof(T) + sizeof (Evoral::EventType)));
+
+		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) {
@@ -59,65 +70,57 @@ MidiRingBuffer<T>::read(MidiBuffer& dst, nframes_t start, nframes_t end, nframes
 			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 (!success) {
-			cerr << "WARNING: error reading event prefix from MIDI ring" << endl;
-			continue;
-		}
-
-		// 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 -= start;
+		ev_time += offset;
 
-			// 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;
-		}
+		/* we're good to go ahead and read the data now but since we
+		 * have the prefix data already, just skip over that
+		 */
+		this->increment_read_ptr (prefix_size);
 
 		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))) {
-				// cerr << "MRB skipping event due to channel mask" << endl;
-				this->skip(ev_size); // Advance read pointer to next event
-				continue;
+		bool r = this->peek (&status, sizeof(uint8_t)); 
+		assert (r); // If this failed, buffer is corrupt, all hope is lost
+
+		/* lets see if we are going to be able to write this event into dst.
+		 */
+		uint8_t* write_loc = dst.reserve (ev_time, ev_size);
+		if (write_loc == 0) {
+			if (stop_on_overflow_in_dst) {
+				DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose ("MidiRingBuffer: overflow in destination MIDI buffer, stopped after %1 events\n", count));
+				break;
 			}
-		}
-
-		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";
+			error << "MRB: Unable to reserve space in buffer, event skipped" << endmsg;
+			this->increment_read_ptr (ev_size); // Advance read pointer to next event
 			continue;
 		}
 
 		// write MIDI buffer contents
-		success = Evoral::EventRingBuffer<T>::full_read(ev_size, write_loc);
+		bool success = read_contents (ev_size, write_loc);
 
 #ifndef NDEBUG
-		DEBUG_TRACE (DEBUG::MidiDiskstreamIO, "wrote MidiEvent to Buffer: ");
-		for (size_t i=0; i < ev_size; ++i) {
-			DEBUG_STR_SET(a, hex);
-			DEBUG_STR(a) << "0x" << (int)write_loc[i] << ' ';
+		if (DEBUG::MidiDiskstreamIO && PBD::debug_bits) {
+			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());
 		}
-		DEBUG_TRACE (DEBUG::MidiDiskstreamIO, "\n");
 #endif
 
 		if (success) {
-			if (is_channel_event(status) && get_channel_mode() == ForceChannel) {
-				write_loc[0] = (write_loc[0] & 0xF0) | (get_channel_mask() & 0x0F);
+
+			if (is_note_on(write_loc[0]) ) {
+				_tracker.add (write_loc[1], write_loc[0] & 0xf);
+			} else if (is_note_off(write_loc[0])) {
+				_tracker.remove (write_loc[1], write_loc[0] & 0xf);
 			}
+
 			++count;
 		} else {
 			cerr << "WARNING: error reading event contents from MIDI ring" << endl;
@@ -126,6 +129,37 @@ MidiRingBuffer<T>::read(MidiBuffer& dst, nframes_t start, nframes_t end, nframes
 
 	return count;
 }
+
+template<typename T>
+void
+MidiRingBuffer<T>::flush (framepos_t /*start*/, framepos_t end)
+{
+	const size_t prefix_size = sizeof(T) + sizeof(Evoral::EventType) + sizeof(uint32_t);
+
+	while (this->read_space() >= prefix_size) {
+		uint8_t  peekbuf[prefix_size];
+		bool     success;
+		uint32_t ev_size;
+		T        ev_time;
+
+		success = this->peek (peekbuf, prefix_size);
+		/* this cannot fail, because we've already verified that there
+		   is prefix_space to read
+		*/
+		assert (success);
+
+		ev_time = *((T*) peekbuf);
+		
+		if (ev_time >= end) {
+			break;
+		}
+
+		ev_size = *((uint32_t*)(peekbuf + sizeof(T) + sizeof (Evoral::EventType)));
+		this->increment_read_ptr (prefix_size);
+		this->increment_read_ptr (ev_size);
+	}
+}
+
 template<typename T>
 void
 MidiRingBuffer<T>::dump(ostream& str)
@@ -140,70 +174,84 @@ MidiRingBuffer<T>::dump(ostream& str)
 	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;
+	RingBufferNPT<uint8_t>::rw_vector vec;
+	RingBufferNPT<uint8_t>::get_read_vector (&vec);
 
-	while (1) {
-		uint8_t* wp;
-		uint8_t* data;
-		size_t write_ptr;
+	if (vec.len[0] == 0) {
+		return;
+	}
 
-#define space(r,w) ((w > r) ? (w - r) : ((w - r + this->_size) % this->_size))
+	str << this << ": Dump size = " << vec.len[0] + vec.len[1]
+	    << " r@ " << RingBufferNPT<uint8_t>::get_read_ptr()
+	    << " w@" << RingBufferNPT<uint8_t>::get_write_ptr() << endl;
 
-		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;
+	uint8_t *buf = new uint8_t[vec.len[0] + vec.len[1]];
+	memcpy (buf, vec.buf[0], vec.len[0]);
 
-		write_ptr  = g_atomic_int_get (&this->_write_ptr);
-		if (space (read_ptr, write_ptr) < sizeof (ev_type)) {
+	if (vec.len[1]) {
+		memcpy (buf+vec.len[1], vec.buf[1], vec.len[1]);
+	}
+
+	uint8_t* data = buf;
+	const uint8_t* end = buf + vec.len[0] + vec.len[1];
+
+	while (data < end) {
+
+		memcpy (&ev_time, data, sizeof (T));
+		data += sizeof (T);
+		str << "\ttime " << ev_time;
+
+		if (data >= end) {
+			str << "(incomplete)\n ";
 			break;
 		}
 
-		wp = &this->_buf[read_ptr];
-		memcpy (&ev_type, wp, sizeof (ev_type));
-		read_ptr = (read_ptr + sizeof (ev_type)) % this->_size;
+		memcpy (&ev_type, data, sizeof (ev_type));
+		data += sizeof (ev_type);
 		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";
+		if (data >= end) {
+			str << "(incomplete)\n";
 			break;
 		}
 
-		wp = &this->_buf[read_ptr];
-		memcpy (&ev_size, wp, sizeof (ev_size));
-		read_ptr = (read_ptr + sizeof (ev_size)) % this->_size;
+		memcpy (&ev_size, data, sizeof (ev_size));
+		data += sizeof (ev_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";
+		if (data >= end) {
+			str << "(incomplete)\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) {
+		for (uint32_t i = 0; i != ev_size && data < end; ++i) {
 			str << ' ' << hex << (int) data[i] << dec;
 		}
 
-		str << endl;
+		data += ev_size;
 
-		delete [] data;
+		str << endl;
 	}
+
+	delete [] buf;
+}
+
+template<typename T>
+void
+MidiRingBuffer<T>::reset_tracker ()
+{
+	_tracker.reset ();
 }
 
+template<typename T>
+void
+MidiRingBuffer<T>::loop_resolve (MidiBuffer& dst, framepos_t t)
+{
+	_tracker.resolve_notes (dst, t);
+}
 
-template class MidiRingBuffer<nframes_t>;
+template class MidiRingBuffer<framepos_t>;
 
+}  // namespace ARDOUR