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 466fc20b63445acf011652a75ecf0dad045c0640..884d1e16f07e63e59ecac1ad0e22a974ad1b9224 100644 (file)
--- a/libs/ardour/midi_state_tracker.cc
+++ b/libs/ardour/midi_state_tracker.cc
@@ -46,16 +46,6 @@ MidiStateTracker::reset ()
        _on = 0;
 }
 
-void
-MidiStateTracker::track_note_onoffs (const Evoral::MIDIEvent<MidiBuffer::TimeType>& event)
-{
-       if (event.is_note_on()) {
-               add (event.note(), event.channel());
-       } else if (event.is_note_off()){
-               remove (event.note(), event.channel());
-       }
-}
-
 void
 MidiStateTracker::add (uint8_t note, uint8_t chn)
 {
@@ -65,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",
@@ -75,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;
@@ -89,28 +79,33 @@ 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]));
 }
 
 void
-MidiStateTracker::track (const MidiBuffer::iterator &from, const MidiBuffer::iterator &to)
+MidiStateTracker::track (const MidiBuffer::const_iterator &from, const MidiBuffer::const_iterator &to)
 {
-       // DEBUG_TRACE (PBD::DEBUG::MidiTrackers, string_compose ("%1 track notes\n", this));
-
-       for (MidiBuffer::iterator i = from; i != to; ++i) {
-               const Evoral::MIDIEvent<MidiBuffer::TimeType> ev(*i, false);
-
-               /* catch AllNotesOff message and turn off all notes
-                */
-               
-               if (ev.type() == MIDI_CTL_ALL_NOTES_OFF) {
-                       cerr << "State tracker sees ALL_NOTES_OFF, silenceing " << sizeof (_active_notes) << endl;
-                       memset (_active_notes, 0, sizeof (_active_notes));
-                       _on = 0;
-               } else {
-                       track_note_onoffs (ev);
-               }
+       for (MidiBuffer::const_iterator i = from; i != to; ++i) {
+               track(*i);
+       }
+}
+
+void
+MidiStateTracker::track (const uint8_t* evbuf)
+{
+       const uint8_t type = evbuf[0] & 0xF0;
+       const uint8_t chan = evbuf[0] & 0x0F;
+       switch (type) {
+       case MIDI_CTL_ALL_NOTES_OFF:
+               reset();
+               break;
+       case MIDI_CMD_NOTE_ON:
+               add(evbuf[1], chan);
+               break;
+       case MIDI_CMD_NOTE_OFF:
+               remove(evbuf[1], chan);
+               break;
        }
 }
 
@@ -134,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));
                        }
                }
@@ -164,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));
                        }
                }
@@ -173,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));
 
@@ -186,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 += 1.0/128.0;
+                               time += Evoral::Beats::tick();
                        }
                }
        }