X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Fmidi_ring_buffer.cc;h=9258b2f7dc7861a66ceba62f920bfb55cbe46fd6;hb=c8c6bca6587450ff64303dbc994a4cd28d6ce7aa;hp=7e88f5ff45ca8a4aa919e908ebf2f0b40ef9c62d;hpb=f74acc6e7921e82842b1c33eb7da00204c6f3039;p=ardour.git diff --git a/libs/ardour/midi_ring_buffer.cc b/libs/ardour/midi_ring_buffer.cc index 7e88f5ff45..9258b2f7dc 100644 --- a/libs/ardour/midi_ring_buffer.cc +++ b/libs/ardour/midi_ring_buffer.cc @@ -83,7 +83,7 @@ MidiRingBuffer::read(MidiBuffer& dst, framepos_t start, framepos_t end, frame this->increment_read_ptr (prefix_size); uint8_t status; - bool r = this->peek (&status, sizeof(uint8_t)); + bool r = this->peek (&status, sizeof(uint8_t)); assert (r); // If this failed, buffer is corrupt, all hope is lost /* lets see if we are going to be able to write this event into dst. @@ -103,7 +103,7 @@ MidiRingBuffer::read(MidiBuffer& dst, framepos_t start, framepos_t end, frame bool success = read_contents (ev_size, write_loc); #ifndef NDEBUG - if (DEBUG::MidiDiskstreamIO && PBD::debug_bits) { + if (DEBUG_ENABLED (DEBUG::MidiDiskstreamIO)) { 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) { @@ -212,7 +212,7 @@ MidiRingBuffer::flush (framepos_t /*start*/, framepos_t end) assert (success); ev_time = *(reinterpret_cast((uintptr_t)peekbuf)); - + if (ev_time >= end) { break; }