NO-OP session-property comments

[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 afe6f07db7438ea35c2293489bdd46d4ae3e5f38..884d1e16f07e63e59ecac1ad0e22a974ad1b9224 100644 (file)
--- a/libs/ardour/midi_state_tracker.cc
+++ b/libs/ardour/midi_state_tracker.cc
@@ -55,7 +55,7 @@ MidiStateTracker::add (uint8_t note, uint8_t chn)
        ++_active_notes[note + 128 * chn];
 
        if (_active_notes[note+128 * chn] > 1) {
-               cerr << this << " note " << (int) note << '/' << (int) chn << " was already on, now at " << (int) _active_notes[note+128*chn] << endl;
+               //cerr << this << " note " << (int) note << '/' << (int) chn << " was already on, now at " << (int) _active_notes[note+128*chn] << endl;
        }
 
        DEBUG_TRACE (PBD::DEBUG::MidiTrackers, string_compose ("%1 ON %2/%3 voices %5 total on %4\n",
@@ -65,7 +65,7 @@ MidiStateTracker::add (uint8_t note, uint8_t chn)
 
 void
 MidiStateTracker::remove (uint8_t note, uint8_t chn)
-{      
+{
        switch (_active_notes[note + 128 * chn]) {
        case 0:
                break;
@@ -79,7 +79,7 @@ MidiStateTracker::remove (uint8_t note, uint8_t chn)
 
        }
        DEBUG_TRACE (PBD::DEBUG::MidiTrackers, string_compose ("%1 OFF %2/%3 current voices = %5 total on %4\n",
-                                                              this, (int) note, (int) chn, _on, 
+                                                              this, (int) note, (int) chn, _on,
                                                               (int) _active_notes[note+128 * chn]));
 }
 
@@ -129,7 +129,7 @@ MidiStateTracker::resolve_notes (MidiBuffer &dst, framepos_t time)
                                */
                                dst.push_back (noteoff);
                                _active_notes[note + 128 * channel]--;
-                               DEBUG_TRACE (PBD::DEBUG::MidiTrackers, string_compose ("%1: MB-resolved note %2/%3 at %4\n", 
+                               DEBUG_TRACE (PBD::DEBUG::MidiTrackers, string_compose ("%1: MB-resolved note %2/%3 at %4\n",
                                                                                       this, (int) note, (int) channel, time));
                        }
                }
@@ -159,7 +159,7 @@ MidiStateTracker::resolve_notes (Evoral::EventSink<framepos_t> &dst, framepos_t
                                */
                                dst.write (time, midi_parameter_type (buf[0]), 3, buf);
                                _active_notes[note + 128 * channel]--;
-                               DEBUG_TRACE (PBD::DEBUG::MidiTrackers, string_compose ("%1: EVS-resolved note %2/%3 at %4\n", 
+                               DEBUG_TRACE (PBD::DEBUG::MidiTrackers, string_compose ("%1: EVS-resolved note %2/%3 at %4\n",
                                                                                       this, (int) note, (int) channel, time));
                        }
                }
@@ -168,7 +168,7 @@ MidiStateTracker::resolve_notes (Evoral::EventSink<framepos_t> &dst, framepos_t
 }
 
 void
-MidiStateTracker::resolve_notes (MidiSource& src, Evoral::MusicalTime time)
+MidiStateTracker::resolve_notes (MidiSource& src, const MidiSource::Lock& lock, Evoral::Beats time)
 {
        DEBUG_TRACE (PBD::DEBUG::MidiTrackers, string_compose ("%1 MS-resolve notes @ %2 on = %3\n", this, time, _on));
 
@@ -181,17 +181,17 @@ MidiStateTracker::resolve_notes (MidiSource& src, Evoral::MusicalTime time)
        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);
+                               Evoral::MIDIEvent<Evoral::Beats> 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);
-                               DEBUG_TRACE (PBD::DEBUG::MidiTrackers, string_compose ("%1: MS-resolved note %2/%3 at %4\n", 
+                               src.append_event_beats (lock, ev);
+                               DEBUG_TRACE (PBD::DEBUG::MidiTrackers, string_compose ("%1: MS-resolved note %2/%3 at %4\n",
                                                                                       this, (int) note, (int) channel, time));
                                _active_notes[note + 128 * channel]--;
                                /* don't stack events up at the same time */
-                               time += Evoral::MusicalTime::tick();
+                               time += Evoral::Beats::tick();
                        }
                }
        }