X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fmidi_state_tracker.h;h=669093142227270ab7736ba1edd213b450b4d181;hb=67ba18d15430f3e639d97a8a30717d7ff009bec1;hp=f9b39f9295ea76beb67192d8a6e6eb39b04f2bdb;hpb=d98302ae2c9040dd61573739b3bbdc708d1dd54e;p=ardour.git

diff --git a/libs/ardour/ardour/midi_state_tracker.h b/libs/ardour/ardour/midi_state_tracker.h
index f9b39f9295..6690931422 100644
--- a/libs/ardour/ardour/midi_state_tracker.h
+++ b/libs/ardour/ardour/midi_state_tracker.h
@@ -1,17 +1,17 @@
 /*
-    Copyright (C) 2008 Paul Davis 
+    Copyright (C) 2008 Paul Davis
     Author: Torben Hohn
-    
+
     This program is free software; you can redistribute it and/or modify it
     under the terms of the GNU General Public License as published by the Free
     Software Foundation; either version 2 of the License, or (at your option)
     any later version.
-    
+
     This program is distributed in the hope that it will be useful, but WITHOUT
     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
     for more details.
-    
+
     You should have received a copy of the GNU General Public License along
     with this program; if not, write to the Free Software Foundation, Inc.,
     675 Mass Ave, Cambridge, MA 02139, USA.
@@ -20,33 +20,52 @@
 #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 {
+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::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, 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());
+	}
 
-	uint8_t _active_notes[128*16];
+private:
+	uint8_t  _active_notes[128*16];
+	uint16_t _on;
 };
 
 
 } // namespace ARDOUR
 
-#endif // __ardour_midi_state_tracker_h__ 
+#endif // __ardour_midi_state_tracker_h__