Fix my name :)

[ardour.git] / libs / ardour / midi_buffer.cc

diff --git a/libs/ardour/midi_buffer.cc b/libs/ardour/midi_buffer.cc
index cbf7603c96020f54a80e84cfaa121a4473608de3..a2f078d8a5944cd2e4e40ca89b474414e1f31bfc 100644 (file)
--- a/libs/ardour/midi_buffer.cc
+++ b/libs/ardour/midi_buffer.cc
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2006-2007 Paul Davis
-       Author: Dave Robillard
+    Author: David Robillard
 
     This program is free software; you can redistribute it and/or modify it
     under the terms of the GNU General Public License as published by the Free
@@ -18,11 +18,17 @@
 */
 
 #include <iostream>
+
 #include "pbd/malign.h"
+#include "pbd/compose.h"
+#include "pbd/debug.h"
+
+#include "ardour/debug.h"
 #include "ardour/midi_buffer.h"
 
 using namespace std;
 using namespace ARDOUR;
+using namespace PBD;
 
 // FIXME: mirroring for MIDI buffers?
 MidiBuffer::MidiBuffer(size_t capacity)
@@ -73,7 +79,7 @@ MidiBuffer::copy(const MidiBuffer& copy)
  * Note that offset and nframes refer to sample time, NOT buffer offsets or event counts.
  */
 void
-MidiBuffer::read_from (const Buffer& src, nframes_t nframes, nframes_t dst_offset, nframes_t src_offset)
+MidiBuffer::read_from (const Buffer& src, framecnt_t nframes, framecnt_t dst_offset, framecnt_t src_offset)
 {
        assert (src.type() == DataType::MIDI);
        assert (&src != this);
@@ -93,6 +99,9 @@ MidiBuffer::read_from (const Buffer& src, nframes_t nframes, nframes_t dst_offse
                const Evoral::MIDIEvent<TimeType> ev(*i, false);
                if (ev.time() >= src_offset && ev.time() < (nframes+src_offset)) {
                        push_back (ev);
+               } else {
+                       cerr << "MIDI event @ " <<  ev.time() << " skipped, not within range "
+                            << src_offset << " .. " << (nframes + src_offset) << endl;
                }
        }
 
@@ -100,7 +109,7 @@ MidiBuffer::read_from (const Buffer& src, nframes_t nframes, nframes_t dst_offse
 }
 
 void
-MidiBuffer::merge_from (const Buffer& src, nframes_t /*nframes*/, nframes_t /*dst_offset*/, nframes_t /*src_offset*/)
+MidiBuffer::merge_from (const Buffer& src, framecnt_t /*nframes*/, framecnt_t /*dst_offset*/, framecnt_t /*src_offset*/)
 {
        const MidiBuffer* mbuf = dynamic_cast<const MidiBuffer*>(&src);
        assert (mbuf);
@@ -147,8 +156,21 @@ bool
 MidiBuffer::push_back(TimeType time, size_t size, const uint8_t* data)
 {
        const size_t stamp_size = sizeof(TimeType);
-       /*cerr << "MidiBuffer: pushing event @ " << ev.time()
-               << " size = " << ev.size() << endl;*/
+
+#ifndef NDEBUG
+       if (DEBUG::MidiIO & PBD::debug_bits) {
+               DEBUG_STR_DECL(a);
+               DEBUG_STR_APPEND(a, string_compose ("midibuffer %1 push event @ %2 sz %3 ", this, time, size));
+               for (size_t i=0; i < size; ++i) {
+                       DEBUG_STR_APPEND(a,hex);
+                       DEBUG_STR_APPEND(a,"0x");
+                       DEBUG_STR_APPEND(a,(int)data[i]);
+                       DEBUG_STR_APPEND(a,' ');
+               }
+               DEBUG_STR_APPEND(a,'\n');
+               DEBUG_TRACE (DEBUG::MidiIO, DEBUG_STR(a).str());
+       }
+#endif
 
        if (_size + stamp_size + size >= _capacity) {
                cerr << "MidiBuffer::push_back failed (buffer is full)" << endl;
@@ -233,7 +255,7 @@ MidiBuffer::reserve(TimeType time, size_t size)
 
 
 void
-MidiBuffer::silence (nframes_t /*nframes*/, nframes_t /*offset*/)
+MidiBuffer::silence (framecnt_t /*nframes*/, framecnt_t /*offset*/)
 {
        /* XXX iterate over existing events, find all in range given by offset & nframes,
           and delete them.
@@ -302,10 +324,12 @@ MidiBuffer::merge_in_place(const MidiBuffer &other)
                        ++them;
                }
 
+#if 0
                if (us != end())
                        cerr << "us @ " << (*us).time() << endl;
                if (them != other.end())
                        cerr << "them @ " << (*them).time() << endl;
+#endif
 
                if (sz) {
                        assert(src >= 0);
@@ -342,7 +366,7 @@ MidiBuffer::merge_in_place(const MidiBuffer &other)
        size_t test_final_count = 0;
        test_time = 0;
        for (iterator i = begin(); i != end(); ++i) {
-               cerr << "CHECK " << test_final_count << " / " << test_us_count + test_them_count << endl;
+               // cerr << "CHECK " << test_final_count << " / " << test_us_count + test_them_count << endl;
                assert(Evoral::midi_event_is_valid((*i).buffer(), (*i).size()));
                assert((*i).time() >= test_time);
                test_time = (*i).time();