X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_state_tracker.cc;h=73b6fb639e1ea0e1db4823fcdc92449e5863ea44;hb=5b4c3aa226dc95f33dc3ffae6669a24f5e8b8fe0;hp=24c9d2884c327e557b61a84b99e969ce966e34bb;hpb=ede4ecbb00ecc866c502454c81e711baea780ccd;p=ardour.git diff --git a/libs/ardour/midi_state_tracker.cc b/libs/ardour/midi_state_tracker.cc index 24c9d2884c..73b6fb639e 100644 --- a/libs/ardour/midi_state_tracker.cc +++ b/libs/ardour/midi_state_tracker.cc @@ -18,8 +18,14 @@ */ #include + +#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" @@ -35,6 +41,7 @@ MidiStateTracker::MidiStateTracker () void MidiStateTracker::reset () { + DEBUG_TRACE (PBD::DEBUG::MidiTrackers, string_compose ("%1: reset\n", this)); memset (_active_notes, 0, sizeof (_active_notes)); _on = 0; } @@ -52,13 +59,23 @@ MidiStateTracker::track_note_onoffs (const Evoral::MIDIEvent 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; @@ -68,30 +85,40 @@ MidiStateTracker::remove (uint8_t note, uint8_t chn) break; default: --_active_notes [note + 128 * chn]; - break; + break; } + 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\n", this)); for (MidiBuffer::iterator i = from; i != to; ++i) { const Evoral::MIDIEvent ev(*i, false); - if (ev.event_type() == LoopEventType) { - looped = true; - continue; - } - track_note_onoffs (ev); + /* 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); + } } } void MidiStateTracker::resolve_notes (MidiBuffer &dst, framepos_t time) { + DEBUG_TRACE (PBD::DEBUG::MidiTrackers, string_compose ("%1 MB-resolve notes @ %2 on = %3\n", this, time, _on)); + if (!_on) { return; } @@ -99,11 +126,16 @@ 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 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", + this, (int) note, (int) channel, time)); } } } @@ -111,10 +143,12 @@ MidiStateTracker::resolve_notes (MidiBuffer &dst, framepos_t time) } void -MidiStateTracker::resolve_notes (Evoral::EventSink &dst, framepos_t time) +MidiStateTracker::resolve_notes (Evoral::EventSink &dst, framepos_t time) { uint8_t buf[3]; + DEBUG_TRACE (PBD::DEBUG::MidiTrackers, string_compose ("%1 EVS-resolve notes @ %2 on = %3\n", this, time, _on)); + if (!_on) { return; } @@ -125,8 +159,13 @@ MidiStateTracker::resolve_notes (Evoral::EventSink &dst, framepos_t 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", + this, (int) note, (int) channel, time)); } } } @@ -136,25 +175,28 @@ MidiStateTracker::resolve_notes (Evoral::EventSink &dst, framepos_t t void MidiStateTracker::resolve_notes (MidiSource& src, Evoral::MusicalTime time) { + DEBUG_TRACE (PBD::DEBUG::MidiTrackers, string_compose ("%1 MS-resolve notes @ %2 on = %3\n", this, time, _on)); + if (!_on) { return; } - /* NOTE: the src must be locked */ + /* NOTE: the src must be locked */ for (int channel = 0; channel < 16; ++channel) { for (int note = 0; note < 128; ++note) { while (_active_notes[note + 128 * channel]) { - Evoral::MIDIEvent 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); + Evoral::MIDIEvent 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", + 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; + /* don't stack events up at the same time */ + time += 1.0/128.0; } } }