Set up region BBT time when frame position changes, if the region is glued to BBT...

[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 03ac16ca8722af7ae7d8f2d54f99ecb8e3f25878..f5020e08a744acd5da0ff6eccd3efd00f310417b 100644 (file)
--- 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;
@@ -89,7 +90,7 @@ MidiStateTracker::track (const MidiBuffer::iterator &from, const MidiBuffer::ite
 }
 
 void
-MidiStateTracker::resolve_notes (MidiBuffer &dst, nframes64_t time)
+MidiStateTracker::resolve_notes (MidiBuffer &dst, framepos_t time)
 {
        if (!_on) {
                return;
@@ -100,7 +101,7 @@ MidiStateTracker::resolve_notes (MidiBuffer &dst, nframes64_t time)
                        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);
+                                       (MIDI_CMD_NOTE_OFF, time, 3, buffer, false);
                                dst.push_back (noteoff);
                                _active_notes[note + 128 * channel]--;
                        }
@@ -110,7 +111,7 @@ MidiStateTracker::resolve_notes (MidiBuffer &dst, nframes64_t time)
 }
 
 void
-MidiStateTracker::resolve_notes (Evoral::EventSink<nframes_t> &dst, nframes64_t time)
+MidiStateTracker::resolve_notes (Evoral::EventSink<framepos_t> &dst, framepos_t time)
 {
        uint8_t buf[3];
 
@@ -132,6 +133,33 @@ MidiStateTracker::resolve_notes (Evoral::EventSink<nframes_t> &dst, nframes64_t
        _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
 MidiStateTracker::dump (ostream& o)
 {