editor toggle button fix from lincoln; refresh location display when loop range chang...

[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 c2aa19e5c8bf8c60ddd4ede546c90b7f384902dd..66d356f9a6c54acd3e2baee0c1ae2c34ac21144c 100644 (file)
--- a/libs/ardour/midi_state_tracker.cc
+++ b/libs/ardour/midi_state_tracker.cc
@@ -18,8 +18,8 @@
 */
 
 #include <iostream>
-#include <ardour/event_type_map.h>
-#include <ardour/midi_state_tracker.h>
+#include "ardour/event_type_map.h"
+#include "ardour/midi_state_tracker.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -31,7 +31,13 @@ MidiStateTracker::MidiStateTracker ()
 }
 
 void
-MidiStateTracker::track_note_onoffs (Evoral::MIDIEvent &event)
+MidiStateTracker::reset ()
+{
+       _active_notes.reset ();
+}
+
+void
+MidiStateTracker::track_note_onoffs (const Evoral::MIDIEvent<MidiBuffer::TimeType>& event)
 {
        if (event.is_note_on()) {
                _active_notes [event.note() + 128 * event.channel()] = true;
@@ -46,12 +52,13 @@ MidiStateTracker::track (const MidiBuffer::iterator &from, const MidiBuffer::ite
        bool ret = false;
 
        for (MidiBuffer::iterator i = from; i != to; ++i) {
-               if ((*i).event_type() == LoopEventType) {
+               const Evoral::MIDIEvent<MidiBuffer::TimeType> ev(*i, false);
+               if (ev.event_type() == LoopEventType) {
                        ret = true;
                        continue;
                }
 
-               track_note_onoffs (*i);
+               track_note_onoffs (ev);
        }
        return ret;
 }
@@ -67,7 +74,8 @@ MidiStateTracker::resolve_notes (MidiBuffer &dst, nframes_t time)
                for (int note = 0; note < 128; ++note) {
                        if (_active_notes[channel * 128 + note]) {
                                uint8_t buffer[3] = { MIDI_CMD_NOTE_OFF | channel, note, 0 };
-                               Evoral::MIDIEvent noteoff (time, MIDI_CMD_NOTE_OFF, 3, buffer, false);
+                               Evoral::MIDIEvent<MidiBuffer::TimeType> noteoff
+                                               (time, MIDI_CMD_NOTE_OFF, 3, buffer, false);
 
                                dst.push_back (noteoff);        
 
@@ -77,3 +85,16 @@ MidiStateTracker::resolve_notes (MidiBuffer &dst, nframes_t time)
        }
 }
 
+void
+MidiStateTracker::dump (ostream& o)
+{
+       o << "******\n";
+       for (int c = 0; c < 16; ++c) {
+               for (int x = 0; x < 128; ++x) {
+                       if (_active_notes[c * 128 + x]) {
+                               o << "Channel " << c+1 << " Note " << x << " is on\n";
+                       }
+               }
+       }
+       o << "+++++\n";
+}