Move EventRingBuffer to libardour.

[ardour.git] / libs / ardour / ardour / midi_ring_buffer.h

diff --git a/libs/ardour/ardour/midi_ring_buffer.h b/libs/ardour/ardour/midi_ring_buffer.h
index 14934456e132f8afc3836fdc8ec56b8f41d4a24c..15e4d2689bafe9134a760779090e9121fecf066c 100644 (file)
--- 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,60 +40,23 @@ 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);
-       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
-        *     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;
-       }
-
-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;
-       }
+       void dump(std::ostream& dst);
+       void flush (framepos_t start, framepos_t end);
 
-       inline bool is_note_off(uint8_t event_type_byte) {
-               // mask out channel information
-               return (event_type_byte & 0xF0) == MIDI_CMD_NOTE_OFF;
-       }
+       void reset_tracker ();
+       void loop_resolve (MidiBuffer& dst, framepos_t);
 
 private:
-       volatile uint32_t _channel_mask; // 16 bits mode, 16 bits mask
        MidiStateTracker _tracker;
 };
 
@@ -132,7 +94,6 @@ MidiRingBuffer<T>::read_contents(uint32_t size, uint8_t* buf)
        return PBD::RingBufferNPT<uint8_t>::read(buf, size) == size;
 }
 
-
 } // namespace ARDOUR
 
 #endif // __ardour_midi_ring_buffer_h__