debug instrumentation for locate time

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

diff --git a/libs/ardour/buffer_set.cc b/libs/ardour/buffer_set.cc
index 9db99d20ce520eeced0825e2614b40a73ac1fe12..243c6777542e018c252d035d6162ad48b575109f 100644 (file)
--- a/libs/ardour/buffer_set.cc
+++ b/libs/ardour/buffer_set.cc
@@ -37,8 +37,9 @@
 #ifdef LV2_SUPPORT
 #include "ardour/lv2_plugin.h"
 #include "lv2_evbuf.h"
+#include "ardour/uri_map.h"
 #endif
-#if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT
+#if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT || defined MACVST_SUPPORT
 #include "ardour/vestige/aeffectx.h"
 #endif
 
@@ -78,7 +79,7 @@ BufferSet::clear()
        _count.reset();
        _available.reset();
 
-#if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT 
+#if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT || defined MACVST_SUPPORT
        for (VSTBuffers::iterator i = _vst_buffers.begin(); i != _vst_buffers.end(); ++i) {
                delete *i;
        }
@@ -86,6 +87,13 @@ BufferSet::clear()
        _vst_buffers.clear ();
 #endif
 
+#ifdef LV2_SUPPORT
+       for (LV2Buffers::iterator i = _lv2_buffers.begin(); i != _lv2_buffers.end(); ++i) {
+               free ((*i).second);
+       }
+       _lv2_buffers.clear ();
+#endif
+
 }
 
 /** Set up this BufferSet so that its data structures mirror a PortSet's buffers.
@@ -179,7 +187,7 @@ BufferSet::ensure_buffers(DataType type, size_t num_buffers, size_t buffer_capac
                for (size_t i = 0; i < num_buffers; ++i) {
                        bufs.push_back(Buffer::create(type, buffer_capacity));
                }
-               
+
                _available.set(type, num_buffers);
                _count.set (type, num_buffers);
        }
@@ -192,13 +200,13 @@ BufferSet::ensure_buffers(DataType type, size_t num_buffers, size_t buffer_capac
                        _lv2_buffers.push_back(
                                std::make_pair(false, lv2_evbuf_new(buffer_capacity,
                                                                    LV2_EVBUF_EVENT,
-                                                                   LV2Plugin::urids.atom_Chunk,
-                                                                   LV2Plugin::urids.atom_Sequence)));
+                                                                   URIMap::instance().urids.atom_Chunk,
+                                                                   URIMap::instance().urids.atom_Sequence)));
                }
        }
 #endif
 
-#if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT
+#if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT || defined MACVST_SUPPORT
        // As above but for VST
        if (type == DataType::MIDI) {
                while (_vst_buffers.size() < _buffers[type].size()) {
@@ -267,8 +275,8 @@ BufferSet::ensure_lv2_bufsize(bool input, size_t i, size_t buffer_capacity)
                std::make_pair(false, lv2_evbuf_new(
                                        buffer_capacity,
                                        LV2_EVBUF_EVENT,
-                                       LV2Plugin::urids.atom_Chunk,
-                                       LV2Plugin::urids.atom_Sequence));
+                                       URIMap::instance().urids.atom_Chunk,
+                                       URIMap::instance().urids.atom_Sequence));
 }
 
 LV2_Evbuf*
@@ -297,7 +305,7 @@ BufferSet::forward_lv2_midi(LV2_Evbuf* buf, size_t i, bool purge_ardour_buffer)
                uint32_t frames, subframes, type, size;
                uint8_t* data;
                lv2_evbuf_get(i, &frames, &subframes, &type, &size, &data);
-               if (type == LV2Plugin::urids.midi_MidiEvent) {
+               if (type == URIMap::instance().urids.midi_MidiEvent) {
                        mbuf.push_back(frames, size, data);
                }
        }
@@ -326,7 +334,7 @@ BufferSet::flush_lv2_midi(bool input, size_t i)
                        DEBUG_TRACE (PBD::DEBUG::LV2, string_compose ("\tByte[%1] = %2\n", x, (int) data[x]));
                }
 #endif
-               if (type == LV2Plugin::urids.midi_MidiEvent) {
+               if (type == URIMap::instance().urids.midi_MidiEvent) {
                        // TODO: Make Ardour event buffers generic so plugins can communicate
                        mbuf.push_back(frames, size, data);
                }
@@ -335,12 +343,13 @@ BufferSet::flush_lv2_midi(bool input, size_t i)
 
 #endif /* LV2_SUPPORT */
 
-#if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT
+#if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT || defined MACVST_SUPPORT
 
 VstEvents*
 BufferSet::get_vst_midi (size_t b)
 {
        MidiBuffer& m = get_midi (b);
+       assert (b <= _vst_buffers.size());
        VSTBuffer* vst = _vst_buffers[b];
 
        vst->clear ();
@@ -353,14 +362,25 @@ BufferSet::get_vst_midi (size_t b)
 }
 
 BufferSet::VSTBuffer::VSTBuffer (size_t c)
-  : _capacity (c)
+       : _events (0)
+       , _midi_events (0)
+       , _capacity (c)
 {
-       _events = static_cast<VstEvents*> (malloc (sizeof (VstEvents) + _capacity * sizeof (VstEvent *)));
-       _midi_events = static_cast<VstMidiEvent*> (malloc (sizeof (VstMidiEvent) * _capacity));
+       if (_capacity > 0) {
+               /* from `man malloc`: "If size is 0, then malloc() returns either NULL, or a
+                * unique pointer value that can later be successfully passed to free()."
+                *
+                * The latter will cause trouble here.
+                */
+               _events = static_cast<VstEvents*> (malloc (sizeof (VstEvents) + _capacity * sizeof (VstEvent *)));
+               _midi_events = static_cast<VstMidiEvent*> (malloc (sizeof (VstMidiEvent) * _capacity));
+       }
 
        if (_events == 0 || _midi_events == 0) {
                free (_events);
                free (_midi_events);
+               _events = 0;
+               _midi_events = 0;
                throw failed_constructor ();
        }
 
@@ -381,7 +401,7 @@ BufferSet::VSTBuffer::clear ()
 }
 
 void
-BufferSet::VSTBuffer::push_back (Evoral::MIDIEvent<framepos_t> const & ev)
+BufferSet::VSTBuffer::push_back (Evoral::Event<framepos_t> const & ev)
 {
        if (ev.size() > 3) {
                /* XXX: this will silently drop MIDI messages longer than 3 bytes, so
@@ -389,8 +409,11 @@ BufferSet::VSTBuffer::push_back (Evoral::MIDIEvent<framepos_t> const & ev)
                */
                return;
        }
-       int const n = _events->numEvents;
-       assert (n < (int) _capacity);
+       uint32_t const n = _events->numEvents;
+       assert (n < _capacity);
+       if (n >= _capacity) {
+               return;
+       }
 
        _events->events[n] = reinterpret_cast<VstEvent*> (_midi_events + n);
        VstMidiEvent* v = reinterpret_cast<VstMidiEvent*> (_events->events[n]);