MIDI region forking, plus Playlist::regions_to_read() fix forward ported from 2.X. region forking requires a few cleanups

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

1 files changed, 30 insertions, 0 deletions

diff --git a/libs/ardour/midi_state_tracker.cc b/libs/ardour/midi_state_tracker.cc
index b2c0086039..da6b8f40b4 100644
--- a/libs/ardour/midi_state_tracker.cc
+++ b/libs/ardour/midi_state_tracker.cc
@@ -20,6 +20,7 @@
 #include <iostream>
 #include "ardour/event_type_map.h"
 #include "ardour/midi_ring_buffer.h"
+#include "ardour/midi_source.h"
 #include "ardour/midi_state_tracker.h"
 
 using namespace std;
@@ -133,6 +134,35 @@ MidiStateTracker::resolve_notes (Evoral::EventSink<nframes_t> &dst, nframes64_t
 }
 
 void
+MidiStateTracker::resolve_notes (MidiSource& src, Evoral::MusicalTime time)
+{
+	if (!_on) {
+		return;
+	}
+
+        /* NOTE: the src must be locked */
+
+	for (int channel = 0; channel < 16; ++channel) {
+		for (int note = 0; note < 128; ++note) {
+			while (_active_notes[note + 128 * channel]) {
+                                Evoral::MIDIEvent<Evoral::MusicalTime> ev ((MIDI_CMD_NOTE_OFF|channel), time, 3, 0, true);
+                                ev.set_type (MIDI_CMD_NOTE_OFF);
+                                ev.set_channel (channel);
+                                ev.set_note (note);
+                                ev.set_velocity (0);
+                                src.append_event_unlocked_beats (ev);
+				_active_notes[note + 128 * channel]--;
+                                cerr << "Resolved " << ev << endl;
+                                /* don't stack events up at the same time
+                                 */
+                                time += 1.0/128.0;
+			}
+		}
+	}
+	_on = 0;
+}
+
+void
 MidiStateTracker::dump (ostream& o)
 {
 	o << "******\n";