remove some unnecessary and hard-to-compile-on-OSX debug stuff

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

diff --git a/libs/ardour/ladspa_plugin.cc b/libs/ardour/ladspa_plugin.cc
index 70a8390de1a4126a3f2c5df5cdabb925baadb6bb..027c16e78cb30f292dcc2f38601307e78907084c 100644 (file)
--- a/libs/ardour/ladspa_plugin.cc
+++ b/libs/ardour/ladspa_plugin.cc
@@ -17,7 +17,6 @@
 
 */
 
-#define __STDC_FORMAT_MACROS 1
 #include <inttypes.h>
 
 #include <vector>
@@ -144,8 +143,6 @@ LadspaPlugin::~LadspaPlugin ()
        deactivate ();
        cleanup ();
 
-       GoingAway (); /* EMIT SIGNAL */
-
        /* XXX who should close a plugin? */
 
         // dlclose (module);
@@ -180,8 +177,6 @@ LadspaPlugin::default_value (uint32_t port)
                        sr_scaling = true;
                }
 
-               /* FIXME: add support for logarithmic defaults */
-
                else if (LADSPA_IS_HINT_DEFAULT_LOW(prh[port].HintDescriptor)) {
                        if (LADSPA_IS_HINT_LOGARITHMIC(prh[port].HintDescriptor)) {
                                ret = exp(log(prh[port].LowerBound) * 0.75f + log(prh[port].UpperBound) * 0.25f);
@@ -378,8 +373,12 @@ LadspaPlugin::save_preset (string name)
 }
 
 int
-LadspaPlugin::set_state(const XMLNode& node)
+LadspaPlugin::set_state (const XMLNode& node, int version)
 {
+       if (version < 3000) {
+               return set_state_2X (node, version);
+       }
+       
        XMLNodeList nodes;
        XMLProperty *prop;
        XMLNodeConstIterator iter;
@@ -422,6 +421,51 @@ LadspaPlugin::set_state(const XMLNode& node)
        return 0;
 }
 
+int
+LadspaPlugin::set_state_2X (const XMLNode& node, int /* version */)
+{
+       XMLNodeList nodes;
+       XMLProperty *prop;
+       XMLNodeConstIterator iter;
+       XMLNode *child;
+       const char *port;
+       const char *data;
+       uint32_t port_id;
+       LocaleGuard lg (X_("POSIX"));
+
+       if (node.name() != state_node_name()) {
+               error << _("Bad node sent to LadspaPlugin::set_state") << endmsg;
+               return -1;
+       }
+
+       nodes = node.children ("port");
+
+       for(iter = nodes.begin(); iter != nodes.end(); ++iter){
+
+               child = *iter;
+
+               if ((prop = child->property("number")) != 0) {
+                       port = prop->value().c_str();
+               } else {
+                       warning << _("LADSPA: no ladspa port number") << endmsg;
+                       continue;
+               }
+               if ((prop = child->property("value")) != 0) {
+                       data = prop->value().c_str();
+               } else {
+                       warning << _("LADSPA: no ladspa port data") << endmsg;
+                       continue;
+               }
+
+               sscanf (port, "%" PRIu32, &port_id);
+               set_parameter (port_id, atof(data));
+       }
+
+       latency_compute_run ();
+
+       return 0;
+}
+
 int
 LadspaPlugin::get_parameter_descriptor (uint32_t which, ParameterDescriptor& desc) const
 {
@@ -589,6 +633,9 @@ LadspaPlugin::run_in_place (nframes_t nframes)
                        _control_data[i] = _shadow_data[i];
                }
        }
+
+       assert (_was_activated);
+       
        _descriptor->run (_handle, nframes);
 }
 
@@ -646,6 +693,7 @@ LadspaPluginInfo::load (Session& session)
                if ((module = dlopen (path.c_str(), RTLD_NOW)) == 0) {
                        error << string_compose(_("LADSPA: cannot load module from \"%1\""), path) << endmsg;
                        error << dlerror() << endmsg;
+                        return PluginPtr ((Plugin*) 0);
                } else {
                        plugin.reset (new LadspaPlugin (module, session.engine(), session, index, session.frame_rate()));
                }
@@ -658,3 +706,8 @@ LadspaPluginInfo::load (Session& session)
                return PluginPtr ((Plugin*) 0);
        }
 }
+
+LadspaPluginInfo::LadspaPluginInfo()
+{
+       type = ARDOUR::LADSPA;
+}