expose more info from plugin-strip (for GUI display)

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

diff --git a/libs/ardour/buffer_set.cc b/libs/ardour/buffer_set.cc
index 184e23d1afff57016e72ff0a0472c867ebbb863a..92f5272b3b2bee945c8723eb0b2188ff58518e9b 100644 (file)
--- a/libs/ardour/buffer_set.cc
+++ b/libs/ardour/buffer_set.cc
@@ -34,6 +34,7 @@
 #include "ardour/midi_buffer.h"
 #include "ardour/port.h"
 #include "ardour/port_set.h"
+#include "ardour/uri_map.h"
 #ifdef LV2_SUPPORT
 #include "ardour/lv2_plugin.h"
 #include "lv2_evbuf.h"
@@ -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
        for (VSTBuffers::iterator i = _vst_buffers.begin(); i != _vst_buffers.end(); ++i) {
                delete *i;
        }
@@ -86,11 +87,18 @@ 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.
  *  This is quite expensive and not RT-safe, so it should not be called in a process context;
- *  get_jack_port_addresses() will fill in a structure set up by this method.
+ *  get_backend_port_addresses() will fill in a structure set up by this method.
  *
  *  XXX: this *is* called in a process context; I'm not sure quite what `should not' means above.
  */
@@ -114,13 +122,13 @@ BufferSet::attach_buffers (PortSet& ports)
        _is_mirror = true;
 }
 
-/** Write the JACK port addresses from a PortSet into our data structures.  This
+/** Write the backend port addresses from a PortSet into our data structures.  This
  *  call assumes that attach_buffers() has already been called for the same PortSet.
  *  Does not allocate, so RT-safe BUT you can only call Port::get_buffer() from
  *  the process() callback tree anyway, so this has to be called in RT context.
  */
 void
-BufferSet::get_jack_port_addresses (PortSet& ports, framecnt_t nframes)
+BufferSet::get_backend_port_addresses (PortSet& ports, framecnt_t nframes)
 {
        assert (_count == ports.count ());
        assert (_available == ports.count ());
@@ -167,7 +175,7 @@ BufferSet::ensure_buffers(DataType type, size_t num_buffers, size_t buffer_capac
        // If there's not enough or they're too small, just nuke the whole thing and
        // rebuild it (so I'm lazy..)
        if (bufs.size() < num_buffers
-                       || (bufs.size() > 0 && bufs[0]->capacity() < buffer_capacity)) {
+           || (bufs.size() > 0 && bufs[0]->capacity() < buffer_capacity)) {
 
                // Nuke it
                for (BufferVec::iterator i = bufs.begin(); i != bufs.end(); ++i) {
@@ -192,8 +200,8 @@ 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
@@ -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);
                }
@@ -468,16 +476,5 @@ BufferSet::silence (framecnt_t nframes, framecnt_t offset)
        }
 }
 
-void
-BufferSet::set_is_silent (bool yn)
-{
-       for (std::vector<BufferVec>::iterator i = _buffers.begin(); i != _buffers.end(); ++i) {
-               for (BufferVec::iterator b = i->begin(); b != i->end(); ++b) {
-                       (*b)->set_is_silent (yn);
-               }
-       }
-
-}
-
 } // namespace ARDOUR