merge and resolve conflict with master

[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 d261115ac13a64a02793b11d2a64c1a9bced6087..73b6fb639e1ea0e1db4823fcdc92449e5863ea44 100644 (file)
--- a/libs/ardour/midi_state_tracker.cc
+++ b/libs/ardour/midi_state_tracker.cc
@@ -20,10 +20,12 @@
 #include <iostream>
 
 #include "pbd/compose.h"
+#include "pbd/stacktrace.h"
+
+#include "evoral/EventSink.hpp"
 
 #include "ardour/debug.h"
 #include "ardour/event_type_map.h"
-#include "ardour/midi_ring_buffer.h"
 #include "ardour/midi_source.h"
 #include "ardour/midi_state_tracker.h"
 
@@ -57,15 +59,23 @@ MidiStateTracker::track_note_onoffs (const Evoral::MIDIEvent<MidiBuffer::TimeTyp
 void
 MidiStateTracker::add (uint8_t note, uint8_t chn)
 {
+       if (_active_notes[note+128 * chn] == 0) {
+               ++_on;
+       }
        ++_active_notes[note + 128 * chn];
-       ++_on;
-       DEBUG_TRACE (PBD::DEBUG::MidiTrackers, string_compose ("MST @ %1 ON %2/%3 total on %4\n",
-                                                              this, (int) note, (int) chn, _on));
+
+       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;
+       }
+
+       DEBUG_TRACE (PBD::DEBUG::MidiTrackers, string_compose ("%1 ON %2/%3 voices %5 total on %4\n",
+                                                              this, (int) note, (int) chn, _on,
+                                                              (int) _active_notes[note+128 * chn]));
 }
 
 void
 MidiStateTracker::remove (uint8_t note, uint8_t chn)
-{
+{      
        switch (_active_notes[note + 128 * chn]) {
        case 0:
                break;
@@ -75,26 +85,21 @@ MidiStateTracker::remove (uint8_t note, uint8_t chn)
                break;
        default:
                --_active_notes [note + 128 * chn];
-                               break;
+               break;
 
        }
-       DEBUG_TRACE (PBD::DEBUG::MidiTrackers, string_compose ("MST @ %1 OFF %2/%3 total on %4\n",
-                                                              this, (int) note, (int) chn, _on));
+       DEBUG_TRACE (PBD::DEBUG::MidiTrackers, string_compose ("%1 OFF %2/%3 current voices = %5 total on %4\n",
+                                                              this, (int) note, (int) chn, _on, 
+                                                              (int) _active_notes[note+128 * chn]));
 }
 
 void
-MidiStateTracker::track (const MidiBuffer::iterator &from, const MidiBuffer::iterator &to, bool& looped)
+MidiStateTracker::track (const MidiBuffer::iterator &from, const MidiBuffer::iterator &to)
 {
-       looped = false;
-
-       // DEBUG_TRACE (PBD::DEBUG::MidiTrackers, string_compose ("%1 track notes, looped = %2\n", this, looped));
+       // 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);
-               if (ev.event_type() == LoopEventType) {
-                       looped = true;
-                       continue;
-               }
 
                /* catch AllNotesOff message and turn off all notes
                 */
@@ -102,9 +107,10 @@ MidiStateTracker::track (const MidiBuffer::iterator &from, const MidiBuffer::ite
                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);
                }
-
-               track_note_onoffs (ev);
        }
 }
 
@@ -120,9 +126,12 @@ MidiStateTracker::resolve_notes (MidiBuffer &dst, framepos_t time)
        for (int channel = 0; channel < 16; ++channel) {
                for (int note = 0; note < 128; ++note) {
                        while (_active_notes[note + 128 * channel]) {
-                               uint8_t buffer[3] = { MIDI_CMD_NOTE_OFF | channel, note, 0 };
+                               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);
+                               /* note that we do not care about failure from
+                                  push_back() ... should we warn someone ?
+                               */
                                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", 
@@ -150,6 +159,9 @@ MidiStateTracker::resolve_notes (Evoral::EventSink<framepos_t> &dst, framepos_t
                                buf[0] = MIDI_CMD_NOTE_OFF|channel;
                                buf[1] = note;
                                buf[2] = 0;
+                               /* note that we do not care about failure from
+                                  write() ... should we warn someone ?
+                               */
                                dst.write (time, EventTypeMap::instance().midi_event_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",