Make Bundles work a bit better. A few include optimisations.

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

diff --git a/libs/ardour/ladspa_plugin.cc b/libs/ardour/ladspa_plugin.cc
index 29f2d16767909392d1b02a75423dbd31ab8158ea..ea8b4314813d644a6e4ca2d7f6b939b0cf02ea4a 100644 (file)
--- a/libs/ardour/ladspa_plugin.cc
+++ b/libs/ardour/ladspa_plugin.cc
@@ -43,6 +43,7 @@
 #include <ardour/audioengine.h>
 #include <ardour/ladspa_plugin.h>
 #include <ardour/buffer_set.h>
+#include <ardour/audio_buffer.h>
 
 #include <pbd/stl_delete.h>
 
@@ -149,13 +150,8 @@ LadspaPlugin::~LadspaPlugin ()
 
         // dlclose (module);
 
-       if (_control_data) {
-               delete [] _control_data;
-       }
-
-       if (_shadow_data) {
-               delete [] _shadow_data;
-       }
+       delete [] _control_data;
+       delete [] _shadow_data;
 }
 
 string
@@ -297,7 +293,7 @@ LadspaPlugin::set_parameter (uint32_t which, float val)
        if (which < _descriptor->PortCount) {
                _shadow_data[which] = (LADSPA_Data) val;
 #if 0
-               ParameterChanged (Parameter(PluginAutomation, which), val); /* EMIT SIGNAL */
+               ParameterChanged (Parameter(PluginAutomation, 0, which), val); /* EMIT SIGNAL */
 
                if (which < parameter_count() && controls[which]) {
                        controls[which]->Changed ();
@@ -471,7 +467,7 @@ LadspaPlugin::get_parameter_descriptor (uint32_t which, ParameterDescriptor& des
 }
 
 string
-LadspaPlugin::describe_parameter (Parameter which)
+LadspaPlugin::describe_parameter (Evoral::Parameter which)
 {
        if (which.type() == PluginAutomation && which.id() < parameter_count()) {
                return port_names()[which.id()];
@@ -494,16 +490,16 @@ LadspaPlugin::signal_latency () const
        }
 }
 
-set<Parameter>
+set<Evoral::Parameter>
 LadspaPlugin::automatable () const
 {
-       set<Parameter> ret;
+       set<Evoral::Parameter> ret;
 
        for (uint32_t i = 0; i < parameter_count(); ++i){
                if (LADSPA_IS_PORT_INPUT(port_descriptor (i)) && 
                    LADSPA_IS_PORT_CONTROL(port_descriptor (i))){
                        
-                       ret.insert (ret.end(), Parameter(PluginAutomation, i));
+                       ret.insert (ret.end(), Evoral::Parameter(PluginAutomation, 0, i));
                }
        }