attempt fix for LTC slave when locating

[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 0403461c73914102288b7bb2afc5c7207c215e2a..4374c064635fa47d61d3d985e1136df1ec60dc10 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",
@@ -122,8 +122,8 @@ MidiStateTracker::resolve_notes (MidiBuffer &dst, framepos_t time)
                for (int note = 0; note < 128; ++note) {
                        while (_active_notes[note + 128 * channel]) {
                                uint8_t buffer[3] = { ((uint8_t) (MIDI_CMD_NOTE_OFF | channel)), uint8_t (note), 0 };
-                               Evoral::MIDIEvent<MidiBuffer::TimeType> noteoff
-                                       (MIDI_CMD_NOTE_OFF, time, 3, buffer, false);
+                               Evoral::Event<MidiBuffer::TimeType> noteoff
+                                       (Evoral::MIDI_EVENT, time, 3, buffer, false);
                                /* note that we do not care about failure from
                                   push_back() ... should we warn someone ?
                                */
@@ -157,7 +157,7 @@ MidiStateTracker::resolve_notes (Evoral::EventSink<framepos_t> &dst, framepos_t
                                /* note that we do not care about failure from
                                   write() ... should we warn someone ?
                                */
-                               dst.write (time, midi_parameter_type (buf[0]), 3, buf);
+                               dst.write (time, Evoral::MIDI_EVENT, 3, buf);
                                _active_notes[note + 128 * channel]--;
                                DEBUG_TRACE (PBD::DEBUG::MidiTrackers, string_compose ("%1: EVS-resolved note %2/%3 at %4\n",
                                                                                       this, (int) note, (int) channel, time));
@@ -181,7 +181,7 @@ MidiStateTracker::resolve_notes (MidiSource& src, const MidiSource::Lock& lock,
        for (int channel = 0; channel < 16; ++channel) {
                for (int note = 0; note < 128; ++note) {
                        while (_active_notes[note + 128 * channel]) {
-                               Evoral::MIDIEvent<Evoral::Beats> ev ((MIDI_CMD_NOTE_OFF|channel), time, 3, 0, true);
+                               Evoral::Event<Evoral::Beats> ev (Evoral::MIDI_EVENT, time, 3, 0, true);
                                ev.set_type (MIDI_CMD_NOTE_OFF);
                                ev.set_channel (channel);
                                ev.set_note (note);
@@ -206,7 +206,7 @@ MidiStateTracker::dump (ostream& o)
                for (int x = 0; x < 128; ++x) {
                        if (_active_notes[c * 128 + x]) {
                                o << "Channel " << c+1 << " Note " << x << " is on ("
-                                 << (int) _active_notes[c*128+x] <<  "times)\n";
+                                 << (int) _active_notes[c*128+x] <<  " times)\n";
                        }
                }
        }