X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fmidi_ring_buffer.h;h=652f1c49cfa22a89d6a53166cd64090071ad7df6;hb=0a52b325f4e1eaf39be65a24f9a594ffe1f66e79;hp=7f5774054a33797fc6a640b063496a04ca214aec;hpb=d89f209f4a8e94c06de2895ff6fd1830c0e5419d;p=ardour.git

diff --git a/libs/ardour/ardour/midi_ring_buffer.h b/libs/ardour/ardour/midi_ring_buffer.h
index 7f5774054a..652f1c49cf 100644
--- a/libs/ardour/ardour/midi_ring_buffer.h
+++ b/libs/ardour/ardour/midi_ring_buffer.h
@@ -22,10 +22,9 @@
 #include <iostream>
 #include <algorithm>
 
-#include "evoral/EventRingBuffer.hpp"
-
+#include "ardour/event_ring_buffer.h"
+#include "ardour/libardour_visibility.h"
 #include "ardour/types.h"
-#include "ardour/buffer.h"
 #include "ardour/midi_state_tracker.h"
 
 namespace ARDOUR {
@@ -41,66 +40,25 @@ class MidiBuffer;
  * [timestamp][type][size][size bytes of raw MIDI][timestamp][type][size](etc...)
  */
 template<typename T>
-class MidiRingBuffer : public Evoral::EventRingBuffer<T> {
+class /*LIBARDOUR_API*/ MidiRingBuffer : public EventRingBuffer<T> {
 public:
-	/** @param size Size in bytes.
-	 */
-	MidiRingBuffer(size_t size)
-		: Evoral::EventRingBuffer<T>(size)
-		, _channel_mask(0x0000FFFF)
-	{}
+	/** @param size Size in bytes. */
+	MidiRingBuffer(size_t size) : EventRingBuffer<T>(size) {}
 
 	inline bool read_prefix(T* time, Evoral::EventType* type, uint32_t* size);
 	inline bool read_contents(uint32_t size, uint8_t* buf);
 
 	size_t read(MidiBuffer& dst, framepos_t start, framepos_t end, framecnt_t offset=0, bool stop_on_overflow_in_destination=false);
-	inline uint32_t write(T  time, Evoral::EventType  type, uint32_t  size, const uint8_t* buf);
+	size_t skip_to(framepos_t start);
 
 	void dump(std::ostream& dst);
 	void flush (framepos_t start, framepos_t end);
 
-	/** Set the channel filtering mode.
-	 * @param mask If mode is FilterChannels, each bit represents a midi channel:
-	 *     bit 0 = channel 0, bit 1 = channel 1 etc. the read and write methods will only
-	 *     process events whose channel bit is 1.
-	 *     If mode is ForceChannel, mask is simply a channel number which all events will
-	 *     be forced to while reading.
-	 */
-	void set_channel_mode(ChannelMode mode, uint16_t mask) {
-		g_atomic_int_set(&_channel_mask, (uint32_t(mode) << 16) | uint32_t(mask));
-	}
-
-	ChannelMode get_channel_mode() const {
-		return static_cast<ChannelMode>((g_atomic_int_get(&_channel_mask) & 0xFFFF0000) >> 16);
-	}
-
-	uint16_t get_channel_mask() const {
-		return g_atomic_int_get(&_channel_mask) & 0x0000FFFF;
-	}
-
 	void reset_tracker ();
-        void loop_resolve (MidiBuffer& dst, framepos_t);
-
-protected:
-	inline bool is_channel_event(uint8_t event_type_byte) {
-		// mask out channel information
-		event_type_byte &= 0xF0;
-		// midi channel events range from 0x80 to 0xE0
-		return (0x80 <= event_type_byte) && (event_type_byte <= 0xE0);
-	}
-
-	inline bool is_note_on(uint8_t event_type_byte) {
-		// mask out channel information
-		return (event_type_byte & 0xF0) == MIDI_CMD_NOTE_ON;
-	}
-
-	inline bool is_note_off(uint8_t event_type_byte) {
-		// mask out channel information
-		return (event_type_byte & 0xF0) == MIDI_CMD_NOTE_OFF;
-	}
+	void resolve_tracker (MidiBuffer& dst, framepos_t);
+	void resolve_tracker (Evoral::EventSink<framepos_t>& dst, framepos_t);
 
 private:
-	volatile uint32_t _channel_mask; // 16 bits mode, 16 bits mask
 	MidiStateTracker _tracker;
 };
 
@@ -138,38 +96,6 @@ MidiRingBuffer<T>::read_contents(uint32_t size, uint8_t* buf)
 	return PBD::RingBufferNPT<uint8_t>::read(buf, size) == size;
 }
 
-template<typename T>
-inline uint32_t
-MidiRingBuffer<T>::write(T time, Evoral::EventType type, uint32_t size, const uint8_t* buf)
-{
-	assert(size > 0);
-	uint8_t status = buf[0];
-
-	// Ignore event if it doesn't match channel filter
-	if (is_channel_event(status)) {
-		ChannelMode mode = get_channel_mode();
-		if (mode == FilterChannels) {
-			const uint8_t channel = status & 0x0F;
-			if (!(get_channel_mask() & (1L << channel))) {
-				return 0;
-			}
-		} else if (mode == ForceChannel) {
-			uint8_t* tmpbuf = (uint8_t*) malloc(size);
-			assert(tmpbuf);
-			memcpy(tmpbuf, buf, size);
-
-			tmpbuf[0] = (tmpbuf[0] & 0xF0) | (get_channel_mask() & 0x0F);
-
-			uint32_t bytes_written = Evoral::EventRingBuffer<T>::write(time, type, size, tmpbuf);
-			free(tmpbuf);
-			return bytes_written;
-		}
-	}
-
-	return Evoral::EventRingBuffer<T>::write(time, type, size, buf);
-}
-
-
 } // namespace ARDOUR
 
 #endif // __ardour_midi_ring_buffer_h__