X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_state_tracker.cc;h=4e43e7269337fdd99145c91a988ea9e6a20a759d;hb=4d112a8e6b90fa64a5cd333042044768111ba994;hp=e25dbdd0942f84f73997d9ca1beb6b04e871eb73;hpb=d98302ae2c9040dd61573739b3bbdc708d1dd54e;p=ardour.git

diff --git a/libs/ardour/midi_state_tracker.cc b/libs/ardour/midi_state_tracker.cc
index e25dbdd094..4e43e72693 100644
--- a/libs/ardour/midi_state_tracker.cc
+++ b/libs/ardour/midi_state_tracker.cc
@@ -1,17 +1,17 @@
 /*
-    Copyright (C) 2006-2008 Paul Davis 
+    Copyright (C) 2006-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.
@@ -19,6 +19,8 @@
 
 #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;
@@ -34,17 +36,40 @@ void
 MidiStateTracker::reset ()
 {
 	memset (_active_notes, 0, sizeof (_active_notes));
+	_on = 0;
 }
 
 void
 MidiStateTracker::track_note_onoffs (const Evoral::MIDIEvent<MidiBuffer::TimeType>& event)
 {
 	if (event.is_note_on()) {
-		_active_notes [event.note() + 128 * event.channel()]++;
+		add (event.note(), event.channel());
 	} else if (event.is_note_off()){
-		if (_active_notes[event.note() + 128 * event.channel()]) {
-			_active_notes [event.note() + 128 * event.channel()]--;
-		}
+		remove (event.note(), event.channel());
+	}
+}
+
+void
+MidiStateTracker::add (uint8_t note, uint8_t chn)
+{
+	++_active_notes[note + 128 * chn];
+	++_on;
+}
+
+void
+MidiStateTracker::remove (uint8_t note, uint8_t chn)
+{
+	switch (_active_notes[note + 128 * chn]) {
+	case 0:
+		break;
+	case 1:
+		--_on;
+		_active_notes [note + 128 * chn] = 0;
+		break;
+	default:
+		--_active_notes [note + 128 * chn];
+				break;
+
 	}
 }
 
@@ -65,20 +90,75 @@ MidiStateTracker::track (const MidiBuffer::iterator &from, const MidiBuffer::ite
 }
 
 void
-MidiStateTracker::resolve_notes (MidiBuffer &dst, nframes_t time)
+MidiStateTracker::resolve_notes (MidiBuffer &dst, nframes64_t time)
 {
+	if (!_on) {
+		return;
+	}
+
 	for (int channel = 0; channel < 16; ++channel) {
 		for (int note = 0; note < 128; ++note) {
-			while (_active_notes[channel * 128 + note]) {
+			while (_active_notes[note + 128 * channel]) {
 				uint8_t buffer[3] = { MIDI_CMD_NOTE_OFF | channel, note, 0 };
 				Evoral::MIDIEvent<MidiBuffer::TimeType> noteoff
-					(time, MIDI_CMD_NOTE_OFF, 3, buffer, false);
-				
-				dst.push_back (noteoff);	
-				_active_notes[channel * 128 + note]--;
+					(MIDI_CMD_NOTE_OFF, time, 3, buffer, false);
+				dst.push_back (noteoff);
+				_active_notes[note + 128 * channel]--;
+			}
+		}
+	}
+	_on = 0;
+}
+
+void
+MidiStateTracker::resolve_notes (Evoral::EventSink<nframes_t> &dst, nframes64_t time)
+{
+	uint8_t buf[3];
+
+	if (!_on) {
+		return;
+	}
+
+	for (int channel = 0; channel < 16; ++channel) {
+		for (int note = 0; note < 128; ++note) {
+			while (_active_notes[note + 128 * channel]) {
+				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[note + 128 * channel]--;
+			}
+		}
+	}
+	_on = 0;
+}
+
+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]--;
+                                /* don't stack events up at the same time
+                                 */
+                                time += 1.0/128.0;
 			}
 		}
 	}
+	_on = 0;
 }
 
 void