remove ControlOnly port flag, since it was essentially unusable

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

diff --git a/libs/ardour/midi_ring_buffer.cc b/libs/ardour/midi_ring_buffer.cc
index 9258b2f7dc7861a66ceba62f920bfb55cbe46fd6..d8479988d5e805ca5f2f7a67ef68a1bf33ef28af 100644 (file)
--- a/libs/ardour/midi_ring_buffer.cc
+++ b/libs/ardour/midi_ring_buffer.cc
@@ -37,7 +37,7 @@ namespace ARDOUR {
  */
 template<typename T>
 size_t
-MidiRingBuffer<T>::read(MidiBuffer& dst, framepos_t start, framepos_t end, framecnt_t offset, bool stop_on_overflow_in_dst)
+MidiRingBuffer<T>::read (MidiBuffer& dst, framepos_t start, framepos_t end, framecnt_t offset, bool stop_on_overflow_in_dst)
 {
        if (this->read_space() == 0) {
                return 0;
@@ -65,13 +65,13 @@ MidiRingBuffer<T>::read(MidiBuffer& dst, framepos_t start, framepos_t end, frame
                }
 
                if (ev_time >= end) {
-                       DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose ("MRB event @ %1 past end @ %2\n", ev_time, end));
+                       DEBUG_TRACE (DEBUG::MidiRingBuffer, string_compose ("MRB event @ %1 past end @ %2\n", ev_time, end));
                        break;
                } else if (ev_time < start) {
-                       DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose ("MRB event @ %1 before start @ %2\n", ev_time, start));
+                       DEBUG_TRACE (DEBUG::MidiRingBuffer, string_compose ("MRB event @ %1 before start @ %2\n", ev_time, start));
                        break;
                } else {
-                       DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose ("MRB event @ %1 in range %2 .. %3\n", ev_time, start, end));
+                       DEBUG_TRACE (DEBUG::MidiRingBuffer, string_compose ("MRB event @ %1 in range %2 .. %3\n", ev_time, start, end));
                }
 
                ev_time -= start;
@@ -91,7 +91,7 @@ MidiRingBuffer<T>::read(MidiBuffer& dst, framepos_t start, framepos_t end, frame
                uint8_t* write_loc = dst.reserve (ev_time, ev_size);
                if (write_loc == 0) {
                        if (stop_on_overflow_in_dst) {
-                               DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose ("MidiRingBuffer: overflow in destination MIDI buffer, stopped after %1 events\n", count));
+                               DEBUG_TRACE (DEBUG::MidiRingBuffer, string_compose ("MidiRingBuffer: overflow in destination MIDI buffer, stopped after %1 events\n", count));
                                break;
                        }
                        error << "MRB: Unable to reserve space in buffer, event skipped" << endmsg;
@@ -100,10 +100,10 @@ MidiRingBuffer<T>::read(MidiBuffer& dst, framepos_t start, framepos_t end, frame
                }
 
                // write MIDI buffer contents
-               bool success = read_contents (ev_size, write_loc);
 
+               bool success = read_contents (ev_size, write_loc);
 #ifndef NDEBUG
-               if (DEBUG_ENABLED (DEBUG::MidiDiskstreamIO)) {
+               if (DEBUG_ENABLED (DEBUG::MidiRingBuffer)) {
                        DEBUG_STR_DECL(a);
                        DEBUG_STR_APPEND(a, string_compose ("wrote MidiEvent to Buffer (time=%1, start=%2 offset=%3)", ev_time, start, offset));
                        for (size_t i=0; i < ev_size; ++i) {
@@ -113,10 +113,9 @@ MidiRingBuffer<T>::read(MidiBuffer& dst, framepos_t start, framepos_t end, frame
                                DEBUG_STR_APPEND(a,' ');
                        }
                        DEBUG_STR_APPEND(a,'\n');
-                       DEBUG_TRACE (DEBUG::MidiDiskstreamIO, DEBUG_STR(a).str());
+                       DEBUG_TRACE (DEBUG::MidiRingBuffer, DEBUG_STR(a).str());
                }
 #endif
-
                if (success) {
                        _tracker.track(write_loc);
                        ++count;
@@ -230,7 +229,7 @@ MidiRingBuffer<T>::dump(ostream& str)
        size_t rspace;
 
        if ((rspace = this->read_space()) == 0) {
-               str << "MRB::dump: empty\n";
+               str << this << " MRB::dump: empty\n";
                return;
        }