remove debug output

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

diff --git a/libs/ardour/midi_buffer.cc b/libs/ardour/midi_buffer.cc
index 4715be928c18d39c88e68225da959fbbe8527bca..50ff7b728fb05ede14c66382c79a417e67ac797c 100644 (file)
--- a/libs/ardour/midi_buffer.cc
+++ b/libs/ardour/midi_buffer.cc
@@ -44,7 +44,7 @@ MidiBuffer::MidiBuffer(size_t capacity)
 
 MidiBuffer::~MidiBuffer()
 {
-       free(_data);
+       cache_aligned_free(_data);
 }
 
 void
@@ -60,7 +60,7 @@ MidiBuffer::resize(size_t size)
                return;
        }
 
-       free (_data);
+       cache_aligned_free (_data);
 
        cache_aligned_malloc ((void**) &_data, size);
 
@@ -163,7 +163,7 @@ MidiBuffer::push_back(TimeType time, size_t size, const uint8_t* data)
        const size_t stamp_size = sizeof(TimeType);
 
 #ifndef NDEBUG
-       if (DEBUG::MidiIO & PBD::debug_bits) {
+       if (DEBUG_ENABLED(DEBUG::MidiIO)) {
                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) {
@@ -190,7 +190,7 @@ MidiBuffer::push_back(TimeType time, size_t size, const uint8_t* data)
        }
 
        uint8_t* const write_loc = _data + _size;
-       *((TimeType*)write_loc) = time;
+       *(reinterpret_cast<TimeType*>((uintptr_t)write_loc)) = time;
        memcpy(write_loc + stamp_size, data, size);
 
        _size += stamp_size + size;
@@ -242,7 +242,7 @@ MidiBuffer::insert_event(const Evoral::MIDIEvent<TimeType>& ev)
        }
 
        uint8_t* const write_loc = _data + insert_offset;
-       *((TimeType*)write_loc) = t;
+       *(reinterpret_cast<TimeType*>((uintptr_t)write_loc)) = t;
        memcpy(write_loc + stamp_size, ev.buffer(), ev.size());
 
        _size += bytes_to_merge;
@@ -250,6 +250,13 @@ MidiBuffer::insert_event(const Evoral::MIDIEvent<TimeType>& ev)
        return true;
 }
 
+uint32_t
+MidiBuffer::write(TimeType time, Evoral::EventType type, uint32_t size, const uint8_t* buf)
+{
+       insert_event(Evoral::MIDIEvent<TimeType>(type, time, size, const_cast<uint8_t*>(buf)));
+       return size;
+}
+
 /** Reserve space for a new event in the buffer.
  *
  * This call is for copying MIDI directly into the buffer, the data location
@@ -267,7 +274,7 @@ MidiBuffer::reserve(TimeType time, size_t size)
 
        // write timestamp
        uint8_t* write_loc = _data + _size;
-       *((TimeType*)write_loc) = time;
+       *(reinterpret_cast<TimeType*>((uintptr_t)write_loc)) = time;
 
        // move write_loc to begin of MIDI buffer data to write to
        write_loc += stamp_size;