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 2eb9df8c5c01e04b3b31c26a07c84ad324047b4d..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
@@ -79,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);
@@ -100,16 +100,16 @@ MidiBuffer::read_from (const Buffer& src, nframes_t nframes, nframes_t dst_offse
                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;
-                }
+                       cerr << "MIDI event @ " <<  ev.time() << " skipped, not within range "
+                            << src_offset << " .. " << (nframes + src_offset) << endl;
+               }
        }
 
        _silent = src.silent();
 }
 
 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);
@@ -137,7 +137,7 @@ MidiBuffer::push_back(const Evoral::MIDIEvent<TimeType>& ev)
                cerr << "MidiBuffer::push_back failed (buffer is full)" << endl;
                return false;
        }
-        
+
        if (!Evoral::midi_event_is_valid(ev.buffer(), ev.size())) {
                cerr << "WARNING: MidiBuffer ignoring illegal MIDI event" << endl;
                return false;
@@ -158,16 +158,18 @@ MidiBuffer::push_back(TimeType time, size_t size, const uint8_t* data)
        const size_t stamp_size = sizeof(TimeType);
 
 #ifndef NDEBUG
-                DEBUG_STR_DECL(a);
-                DEBUG_STR_APPEND(a, string_compose ("midibuffer %1 push event @ %2 sz %3 ", this, time, size));
+       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,' ');
                }
-                DEBUG_STR_APPEND(a,'\n');
-                DEBUG_TRACE (DEBUG::MidiIO, DEBUG_STR(a).str());
+               DEBUG_STR_APPEND(a,'\n');
+               DEBUG_TRACE (DEBUG::MidiIO, DEBUG_STR(a).str());
+       }
 #endif
 
        if (_size + stamp_size + size >= _capacity) {
@@ -253,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.
@@ -322,7 +324,7 @@ MidiBuffer::merge_in_place(const MidiBuffer &other)
                        ++them;
                }
 
-#if 0                
+#if 0
                if (us != end())
                        cerr << "us @ " << (*us).time() << endl;
                if (them != other.end())