Set the revision mechanism independent from the VCS name

[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..b3e532bdbe90f5743d0fa66dac567d629ca01a06 100644 (file)
--- a/libs/ardour/ardour/midi_ring_buffer.h
+++ b/libs/ardour/ardour/midi_ring_buffer.h
@@ -25,7 +25,6 @@
 #include "evoral/EventRingBuffer.hpp"
 
 #include "ardour/types.h"
-#include "ardour/buffer.h"
 #include "ardour/midi_state_tracker.h"
 
 namespace ARDOUR {
@@ -54,7 +53,10 @@ public:
        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);
+
        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:
@@ -75,6 +77,9 @@ public:
                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
@@ -132,6 +137,37 @@ 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