Reverse parameters to CPPUNIT_ASSERT_EQUAL so its assert

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

diff --git a/libs/ardour/ardour/midi_state_tracker.h b/libs/ardour/ardour/midi_state_tracker.h
index 7b95772cacab496dd1b603e2ece302569c09b840..64e4aace2d2f66f4d5e82721964582aec52b79ef 100644 (file)
--- a/libs/ardour/ardour/midi_state_tracker.h
+++ b/libs/ardour/ardour/midi_state_tracker.h
@@ -20,12 +20,14 @@
 #ifndef __ardour_midi_state_tracker_h__
 #define __ardour_midi_state_tracker_h__
 
-#include <bitset>
 #include "ardour/midi_buffer.h"
 
-namespace ARDOUR {
+namespace Evoral {
+template <typename T> class EventSink;
+}
 
-template <typename T> class MidiRingBuffer;
+namespace ARDOUR {
+class MidiSource;
 
 /** Tracks played notes, so they can be resolved in potential stuck note
  * situations (e.g. looping, transport stop, etc).
@@ -38,15 +40,22 @@ public:
        void track (const MidiBuffer::iterator& from, const MidiBuffer::iterator& to, bool& looped);
        void add (uint8_t note, uint8_t chn);
        void remove (uint8_t note, uint8_t chn);
-       void resolve_notes (MidiBuffer& buffer, nframes64_t time);
-       void resolve_notes (MidiRingBuffer<nframes_t>& buffer, nframes64_t time);
+       void resolve_notes (MidiBuffer& buffer, framepos_t time);
+       void resolve_notes (Evoral::EventSink<framepos_t>& buffer, framepos_t time);
+       void resolve_notes (MidiSource& src, Evoral::MusicalTime time);
        void dump (std::ostream&);
        void reset ();
+       bool empty() const { return _on == 0; }
+       uint16_t on() const { return _on; }
+       bool active (uint8_t note, uint8_t channel) {
+               return _active_notes[(channel*128)+note] > 0;
+       }
 
 private:
        void track_note_onoffs(const Evoral::MIDIEvent<MidiBuffer::TimeType>& event);
 
-       uint8_t _active_notes[128*16];
+       uint8_t  _active_notes[128*16];
+       uint16_t _on;
 };