a grab bag of changes correcting and improving the way MIDI note on/off tracking...

[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 2de611f4d636a0fc02d477caa9ad61cc781ae686..4b352b3c4dcf074d2271f090845f4529b600b479 100644 (file)
--- a/libs/ardour/ardour/midi_ring_buffer.h
+++ b/libs/ardour/ardour/midi_ring_buffer.h
@@ -21,9 +21,12 @@
 
 #include <iostream>
 #include <algorithm>
+
+#include "evoral/EventRingBuffer.hpp"
+
 #include "ardour/types.h"
 #include "ardour/buffer.h"
-#include "evoral/EventRingBuffer.hpp"
+#include "ardour/midi_state_tracker.h"
 
 namespace ARDOUR {
 
@@ -50,7 +53,7 @@ public:
        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);
+       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.
@@ -72,6 +75,8 @@ public:
                return g_atomic_int_get(&_channel_mask) & 0x0000FFFF;
        }
 
+       void reset_tracker ();
+       
 protected:
        inline bool is_channel_event(uint8_t event_type_byte) {
                // mask out channel information
@@ -80,8 +85,19 @@ protected:
                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;
+       }
+
 private:
        volatile uint32_t _channel_mask; // 16 bits mode, 16 bits mask
+       MidiStateTracker _tracker;
 };
 
 
@@ -92,13 +108,19 @@ template<typename T>
 inline bool
 MidiRingBuffer<T>::read_prefix(T* time, Evoral::EventType* type, uint32_t* size)
 {
-       bool success = Evoral::EventRingBuffer<T>::full_read(sizeof(T), (uint8_t*)time);
-       if (success)
-               success = Evoral::EventRingBuffer<T>::full_read(sizeof(Evoral::EventType), (uint8_t*)type);
-       if (success)
-               success = Evoral::EventRingBuffer<T>::full_read(sizeof(uint32_t), (uint8_t*)size);
+       if (PBD::RingBufferNPT<uint8_t>::read((uint8_t*)time, sizeof(T)) != sizeof (T)) {
+               return false;
+       }
+
+       if (PBD::RingBufferNPT<uint8_t>::read((uint8_t*)type, sizeof(Evoral::EventType)) != sizeof (Evoral::EventType)) {
+               return false;
+       }
+
+       if (PBD::RingBufferNPT<uint8_t>::read((uint8_t*)size, sizeof(uint32_t)) != sizeof (uint32_t)) {
+               return false;
+       }
 
-       return success;
+       return true;
 }
 
 
@@ -109,7 +131,7 @@ template<typename T>
 inline bool
 MidiRingBuffer<T>::read_contents(uint32_t size, uint8_t* buf)
 {
-       return Evoral::EventRingBuffer<T>::full_read(size, buf);
+       return PBD::RingBufferNPT<uint8_t>::read(buf, size) == size;
 }