Reverse parameters to CPPUNIT_ASSERT_EQUAL so its assert

[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 ec489ee5b6dc5c292fd31d3a97bfbb06b0183397..4b352b3c4dcf074d2271f090845f4529b600b479 100644 (file)
--- 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
@@ -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 {
 
@@ -37,20 +40,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);
-       
+       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
@@ -59,16 +64,18 @@ public:
         *     be forced to while reading.
         */
        void set_channel_mode(ChannelMode mode, uint16_t mask) {
-               g_atomic_int_set(&_channel_mask, ((uint16_t)mode << 16) | 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 static_cast<ChannelMode>((g_atomic_int_get(&_channel_mask) & 0x0000FFFF));
+               return g_atomic_int_get(&_channel_mask) & 0x0000FFFF;
        }
+
+       void reset_tracker ();
        
 protected:
        inline bool is_channel_event(uint8_t event_type_byte) {
@@ -77,35 +84,54 @@ protected:
                // 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;
+       }
+
 private:
        volatile uint32_t _channel_mask; // 16 bits mode, 16 bits mask
+       MidiStateTracker _tracker;
 };
 
 
 /** 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);
-       if (success)
-               success = Evoral::EventRingBuffer::full_read(sizeof(Evoral::EventType), (uint8_t*)type);
-       if (success)
-               success = Evoral::EventRingBuffer::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;
 }
 
 
 /** 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 PBD::RingBufferNPT<uint8_t>::read(buf, size) == size;
 }