move latency-recompute into dedicated thread.

[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 64e4aace2d2f66f4d5e82721964582aec52b79ef..669093142227270ab7736ba1edd213b450b4d181 100644 (file)
--- a/libs/ardour/ardour/midi_state_tracker.h
+++ b/libs/ardour/ardour/midi_state_tracker.h
@@ -20,6 +20,8 @@
 #ifndef __ardour_midi_state_tracker_h__
 #define __ardour_midi_state_tracker_h__
 
+#include <glibmm/threads.h>
+
 #include "ardour/midi_buffer.h"
 
 namespace Evoral {
@@ -27,22 +29,24 @@ 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, framepos_t time);
        void resolve_notes (Evoral::EventSink<framepos_t>& buffer, framepos_t time);
-       void resolve_notes (MidiSource& src, Evoral::MusicalTime 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; }
@@ -51,9 +55,12 @@ public:
                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;
 };