tentative fix for losing (empty) MIDI files. Incomplete because testing shows issues...

[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 f5a44788dba3a26ac54b3620d06f5c125a09a0ee..046e77f38c83bbd9973a92d0924fb7dba26c0ff9 100644 (file)
--- a/libs/ardour/ardour/midi_state_tracker.h
+++ b/libs/ardour/ardour/midi_state_tracker.h
@@ -20,30 +20,43 @@
 #ifndef __ardour_midi_state_tracker_h__
 #define __ardour_midi_state_tracker_h__
 
-#include <bitset>
-
 #include "ardour/midi_buffer.h"
 
+namespace Evoral {
+template <typename T> class EventSink;
+}
+
 namespace ARDOUR {
 
+class MidiSource;
 
 /** Tracks played notes, so they can be resolved in potential stuck note
  * situations (e.g. looping, transport stop, etc).
  */
-class MidiStateTracker
+class LIBARDOUR_API MidiStateTracker
 {
 public:
        MidiStateTracker();
 
-       void track (const MidiBuffer::iterator& from, const MidiBuffer::iterator& to, bool& looped);
-       void resolve_notes (MidiBuffer& buffer, nframes_t time);
+       void track (const MidiBuffer::iterator& from, const MidiBuffer::iterator& to);
+       void add (uint8_t note, uint8_t chn);
+       void remove (uint8_t note, uint8_t chn);
+       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;
 };