X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fmidi_state_tracker.h;h=669093142227270ab7736ba1edd213b450b4d181;hb=fa73112f081ee38bc5c9752f900c9c5dccb68141;hp=046e77f38c83bbd9973a92d0924fb7dba26c0ff9;hpb=23e7cf10191270d70357ccf0ed9294f020c7b7ab;p=ardour.git

diff --git a/libs/ardour/ardour/midi_state_tracker.h b/libs/ardour/ardour/midi_state_tracker.h
index 046e77f38c..6690931422 100644
--- 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 {
@@ -38,12 +40,13 @@ class LIBARDOUR_API MidiStateTracker
 public:
 	MidiStateTracker();
 
-	void track (const MidiBuffer::iterator& from, const MidiBuffer::iterator& to);
+	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; }
@@ -52,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;
 };