X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fmidi_ring_buffer.h;h=2de611f4d636a0fc02d477caa9ad61cc781ae686;hb=2a6dcddcc513fa3ebc1aad4b2e5fede62277aba5;hp=7ffdcf3b8c899387c5f4ccff790aa8f670688395;hpb=cca4f22141d64afce82fd8851cde8eb8ce597c9f;p=ardour.git

diff --git a/libs/ardour/ardour/midi_ring_buffer.h b/libs/ardour/ardour/midi_ring_buffer.h
index 7ffdcf3b8c..2de611f4d6 100644
--- a/libs/ardour/ardour/midi_ring_buffer.h
+++ b/libs/ardour/ardour/midi_ring_buffer.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2006 Paul Davis 
+    Copyright (C) 2006 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -37,20 +37,22 @@ class MidiBuffer;
  *
  * [timestamp][type][size][size bytes of raw MIDI][timestamp][type][size](etc...)
  */
-class MidiRingBuffer : public Evoral::EventRingBuffer {
+template<typename T>
+class MidiRingBuffer : public Evoral::EventRingBuffer<T> {
 public:
 	/** @param size Size in bytes.
 	 */
 	MidiRingBuffer(size_t size)
-		: Evoral::EventRingBuffer(size)
+		: Evoral::EventRingBuffer<T>(size)
 		, _channel_mask(0x0000FFFF)
 	{}
 
-	inline bool read_prefix(Evoral::EventTime* time, Evoral::EventType* type, uint32_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, nframes_t start, nframes_t end, nframes_t offset=0);
-	
+	void dump(std::ostream& dst);
+
 	/** 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
@@ -65,11 +67,11 @@ public:
 	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;
 	}
-	
+
 protected:
 	inline bool is_channel_event(uint8_t event_type_byte) {
 		// mask out channel information
@@ -77,7 +79,7 @@ protected:
 		// midi channel events range from 0x80 to 0xE0
 		return (0x80 <= event_type_byte) && (event_type_byte <= 0xE0);
 	}
-	
+
 private:
 	volatile uint32_t _channel_mask; // 16 bits mode, 16 bits mask
 };
@@ -86,14 +88,15 @@ private:
 /** Read the time and size of an event.  This call MUST be immediately proceeded
  * by a call to read_contents (or the read pointer will be garbage).
  */
+template<typename T>
 inline bool
-MidiRingBuffer::read_prefix(Evoral::EventTime* time, Evoral::EventType* type, uint32_t* size)
+MidiRingBuffer<T>::read_prefix(T* time, Evoral::EventType* type, uint32_t* size)
 {
-	bool success = Evoral::EventRingBuffer::full_read(sizeof(Evoral::EventTime), (uint8_t*)time);
+	bool success = Evoral::EventRingBuffer<T>::full_read(sizeof(T), (uint8_t*)time);
 	if (success)
-		success = Evoral::EventRingBuffer::full_read(sizeof(Evoral::EventType), (uint8_t*)type);
+		success = Evoral::EventRingBuffer<T>::full_read(sizeof(Evoral::EventType), (uint8_t*)type);
 	if (success)
-		success = Evoral::EventRingBuffer::full_read(sizeof(uint32_t), (uint8_t*)size);
+		success = Evoral::EventRingBuffer<T>::full_read(sizeof(uint32_t), (uint8_t*)size);
 
 	return success;
 }
@@ -102,10 +105,11 @@ MidiRingBuffer::read_prefix(Evoral::EventTime* time, Evoral::EventType* type, ui
 /** Read the content of an event.  This call MUST be immediately preceded
  * by a call to read_prefix (or the returned even will be garbage).
  */
+template<typename T>
 inline bool
-MidiRingBuffer::read_contents(uint32_t size, uint8_t* buf)
+MidiRingBuffer<T>::read_contents(uint32_t size, uint8_t* buf)
 {
-	return Evoral::EventRingBuffer::full_read(size, buf);
+	return Evoral::EventRingBuffer<T>::full_read(size, buf);
 }