track notes at the region level in MidiPlaylist; resolve them (deliver note offs) if a note spans the end of the region

git-svn-id: svn://localhost/ardour2/branches/3.0@5804 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 33 insertions, 0 deletions

diff --git a/libs/ardour/midi_state_tracker.cc b/libs/ardour/midi_state_tracker.cc
index 8d58969d57..e3c66e4df8 100644
--- a/libs/ardour/midi_state_tracker.cc
+++ b/libs/ardour/midi_state_tracker.cc
@@ -19,6 +19,7 @@
 
 #include <iostream>
 #include "ardour/event_type_map.h"
+#include "ardour/midi_ring_buffer.h"
 #include "ardour/midi_state_tracker.h"
 
 using namespace std;
@@ -47,6 +48,21 @@ MidiStateTracker::track_note_onoffs (const Evoral::MIDIEvent<MidiBuffer::TimeTyp
 		}
 	}
 }
+void
+MidiStateTracker::add (uint8_t note, uint8_t chn)
+{
+	cerr << "Added note " << note << " chan " << chn << endl;
+	_active_notes[note + 128 * chn]++;
+}
+
+void
+MidiStateTracker::remove (uint8_t note, uint8_t chn)
+{
+	if (_active_notes[note + 128 * chn]) {
+		cerr << "Removed note " << note << " chan " << chn << endl;
+		_active_notes[note + 128 * chn]--;
+	}
+}
 
 void
 MidiStateTracker::track (const MidiBuffer::iterator &from, const MidiBuffer::iterator &to, bool& looped)
@@ -82,6 +98,23 @@ MidiStateTracker::resolve_notes (MidiBuffer &dst, nframes64_t time)
 }
 
 void
+MidiStateTracker::resolve_notes (MidiRingBuffer<nframes_t> &dst, nframes64_t time)
+{
+	uint8_t buf[3];
+	for (int channel = 0; channel < 16; ++channel) {
+		for (int note = 0; note < 128; ++note) {
+			while (_active_notes[channel * 128 + note]) {
+				buf[0] = MIDI_CMD_NOTE_OFF|channel;
+				buf[1] = note;
+				buf[2] = 0;
+				dst.write (time, EventTypeMap::instance().midi_event_type (buf[0]), 3, buf);
+				_active_notes[channel * 128 + note]--;
+			}
+		}
+	}
+}
+
+void
 MidiStateTracker::dump (ostream& o)
 {
 	o << "******\n";