force IFS=/ when calling path_expand, so that whitespace in paths doesn't cause worde...

[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 24c9d2884c327e557b61a84b99e969ce966e34bb..f5020e08a744acd5da0ff6eccd3efd00f310417b 100644 (file)
--- a/libs/ardour/midi_state_tracker.cc
+++ b/libs/ardour/midi_state_tracker.cc
@@ -111,7 +111,7 @@ MidiStateTracker::resolve_notes (MidiBuffer &dst, framepos_t time)
 }
 
 void
-MidiStateTracker::resolve_notes (Evoral::EventSink<nframes_t> &dst, framepos_t time)
+MidiStateTracker::resolve_notes (Evoral::EventSink<framepos_t> &dst, framepos_t time)
 {
        uint8_t buf[3];
 
@@ -140,21 +140,20 @@ MidiStateTracker::resolve_notes (MidiSource& src, Evoral::MusicalTime time)
                return;
        }
 
-        /* NOTE: the src must be locked */
+       /* 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);
+                               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;
+                               /* don't stack events up at the same time */
+                               time += 1.0/128.0;
                        }
                }
        }