track notes at the region level in MidiPlaylist; resolve them (deliver note offs...

[ardour.git] / libs / ardour / midi_state_tracker.cc

diff --git a/libs/ardour/midi_state_tracker.cc b/libs/ardour/midi_state_tracker.cc
index 69d18076232761519d0b9908e2395278a8cb0d80..e3c66e4df85010e90a731d66b9951058f15a9441 100644 (file)
--- 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)
@@ -65,7 +81,7 @@ 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)
 {
        for (int channel = 0; channel < 16; ++channel) {
                for (int note = 0; note < 128; ++note) {
@@ -73,8 +89,25 @@ MidiStateTracker::resolve_notes (MidiBuffer &dst, nframes_t time)
                                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]--;
+                       }
+               }
+       }
+}
+
+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]--;
                        }
                }