Support thread-safe LV2 state restoration

[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 76a669838aa6d9565681e13037a99f86c5e3d00f..669093142227270ab7736ba1edd213b450b4d181 100644 (file)
--- a/libs/ardour/ardour/midi_state_tracker.h
+++ b/libs/ardour/ardour/midi_state_tracker.h
@@ -20,7 +20,8 @@
 #ifndef __ardour_midi_state_tracker_h__
 #define __ardour_midi_state_tracker_h__
 
-#include <bitset>
+#include <glibmm/threads.h>
+
 #include "ardour/midi_buffer.h"
 
 namespace Evoral {
@@ -29,28 +30,37 @@ 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 track (const MidiBuffer::const_iterator& from, const MidiBuffer::const_iterator& to);
+       void track (const uint8_t* evbuf);
        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 (Evoral::EventSink<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, const Glib::Threads::Mutex::Lock& lock, Evoral::Beats 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);
+       template<typename Time>
+       void track (const Evoral::Event<Time>& ev) {
+               track (ev.buffer());
+       }
 
+private:
        uint8_t  _active_notes[128*16];
        uint16_t _on;
 };