From ed2beaffeef72ddce8ac628cced672851ec5668d Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 22 Dec 2011 20:14:47 +0000 Subject: main fix: when transport stops, clear per-region per-playlist note trackers even if there is no capture data to process; side effects: remove unused MidiBuffer::merge() and add DEBUG::MidiTrackers as well as more and better MIDI debug tracing facilities git-svn-id: svn://localhost/ardour2/branches/3.0@11057 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/buffer_set.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'libs/ardour/buffer_set.cc') diff --git a/libs/ardour/buffer_set.cc b/libs/ardour/buffer_set.cc index 2bd360b42c..caf6d7e8d2 100644 --- a/libs/ardour/buffer_set.cc +++ b/libs/ardour/buffer_set.cc @@ -23,6 +23,7 @@ #include #include +#include #include "pbd/compose.h" @@ -258,13 +259,16 @@ BufferSet::get_lv2_midi(bool input, size_t i) ebuf->reset(); if (input) { + DEBUG_TRACE (PBD::DEBUG::LV2, string_compose ("%1 bytes of MIDI waiting @ %2\n", mbuf.size(), (void*) mbuf.data())); for (MidiBuffer::iterator e = mbuf.begin(); e != mbuf.end(); ++e) { const Evoral::MIDIEvent ev(*e, false); uint32_t type = LV2Plugin::midi_event_type(); #ifndef NDEBUG - DEBUG_TRACE (PBD::DEBUG::LV2, string_compose ("(FLUSH) MIDI event of size %1\n", ev.size())); + DEBUG_TRACE (PBD::DEBUG::LV2, string_compose ("\tMIDI event of size %1 @ %2\n", ev.size(), ev.time())); for (uint16_t x = 0; x < ev.size(); ++x) { - DEBUG_TRACE (PBD::DEBUG::LV2, string_compose ("\tByte[%1] = %2\n", x, (int) ev.buffer()[x])); + std::stringstream ss; + ss << "\t\tByte[" << x << "] = " << std::hex << (int) ev.buffer()[x] << std::dec << std::endl; + DEBUG_TRACE (PBD::DEBUG::LV2, ss.str()); } #endif ebuf->append(ev.time(), 0, type, ev.size(), ev.buffer()); -- cgit v1.2.3