X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fladspa_plugin.cc;h=61149c78a01d61c81786aeddc9c2dede3f888560;hb=3c3d62c18a88c9a3ce8ae4d5f7a44470d302a1bf;hp=c78d8a28ddea85da5026ade4abf5fa75ceacce63;hpb=07d94b9b4868fad26c9e8ac2ae4901849a09b8ac;p=ardour.git

diff --git a/libs/ardour/ladspa_plugin.cc b/libs/ardour/ladspa_plugin.cc
index c78d8a28dd..61149c78a0 100644
--- a/libs/ardour/ladspa_plugin.cc
+++ b/libs/ardour/ladspa_plugin.cc
@@ -29,7 +29,9 @@
 #include <cstdlib>
 #include <cstdio> // so libraptor doesn't complain
 #include <cmath>
+#ifndef COMPILER_MSVC
 #include <dirent.h>
+#endif
 #include <sys/stat.h>
 #include <cerrno>
 
@@ -42,8 +44,6 @@
 #include "pbd/xml++.h"
 #include "pbd/stacktrace.h"
 
-#include "midi++/manager.h"
-
 #include "ardour/session.h"
 #include "ardour/ladspa_plugin.h"
 #include "ardour/buffer_set.h"
@@ -127,7 +127,9 @@ LadspaPlugin::init (string module_path, uint32_t index, framecnt_t rate)
 	port_cnt = parameter_count();
 
 	_control_data = new LADSPA_Data[port_cnt];
+	memset (_control_data, 0, sizeof (LADSPA_Data) * port_cnt);
 	_shadow_data = new LADSPA_Data[port_cnt];
+	memset (_shadow_data, 0, sizeof (LADSPA_Data) * port_cnt);
 
 	for (i = 0; i < port_cnt; ++i) {
 		if (LADSPA_IS_PORT_CONTROL(port_descriptor (i))) {
@@ -143,7 +145,7 @@ LadspaPlugin::init (string module_path, uint32_t index, framecnt_t rate)
 				continue;
 			}
 
-			_shadow_data[i] = default_value (i);
+			_shadow_data[i] = _default_value (i);
 		}
 	}
 
@@ -171,7 +173,7 @@ LadspaPlugin::unique_id() const
 }
 
 float
-LadspaPlugin::default_value (uint32_t port)
+LadspaPlugin::_default_value (uint32_t port) const
 {
 	const LADSPA_PortRangeHint *prh = port_range_hints();
 	float ret = 0.0f;
@@ -349,7 +351,7 @@ LadspaPlugin::add_state (XMLNode* root) const
 {
 	XMLNode *child;
 	char buf[16];
-	LocaleGuard lg (X_("POSIX"));
+	LocaleGuard lg (X_("C"));
 
 	for (uint32_t i = 0; i < parameter_count(); ++i){
 
@@ -382,7 +384,7 @@ LadspaPlugin::set_state (const XMLNode& node, int version)
 	const char *data;
 	uint32_t port_id;
 #endif
-	LocaleGuard lg (X_("POSIX"));
+	LocaleGuard lg (X_("C"));
 
 	if (node.name() != state_node_name()) {
 		error << _("Bad node sent to LadspaPlugin::set_state") << endmsg;
@@ -432,7 +434,7 @@ LadspaPlugin::set_state_2X (const XMLNode& node, int /* version */)
 	const char *data;
 	uint32_t port_id;
 #endif
-	LocaleGuard lg (X_("POSIX"));
+	LocaleGuard lg (X_("C"));
 
 	if (node.name() != state_node_name()) {
 		error << _("Bad node sent to LadspaPlugin::set_state") << endmsg;
@@ -502,15 +504,14 @@ LadspaPlugin::get_parameter_descriptor (uint32_t which, ParameterDescriptor& des
 		desc.upper = 4; /* completely arbitrary */
 	}
 
-	if (LADSPA_IS_HINT_INTEGER (prh.HintDescriptor)) {
-		desc.step = 1.0;
-		desc.smallstep = 0.1;
-		desc.largestep = 10.0;
+	if (LADSPA_IS_HINT_HAS_DEFAULT (prh.HintDescriptor)) {
+		desc.normal = _default_value(which);
 	} else {
-		float delta = desc.upper - desc.lower;
-		desc.step = delta / 1000.0f;
-		desc.smallstep = delta / 10000.0f;
-		desc.largestep = delta/10.0f;
+		/* if there is no explicit hint for the default
+		 * value, use lower bound. This is not great but
+		 * better than just assuming '0' which may be out-of range.
+		 */
+		desc.normal = desc.lower;
 	}
 
 	desc.toggled = LADSPA_IS_HINT_TOGGLED (prh.HintDescriptor);
@@ -520,6 +521,9 @@ LadspaPlugin::get_parameter_descriptor (uint32_t which, ParameterDescriptor& des
 
 	desc.label = port_names()[which];
 
+	desc.scale_points = get_scale_points(which);
+	desc.update_steps();
+
 	return 0;
 }
 
@@ -638,10 +642,10 @@ LadspaPlugin::print_parameter (uint32_t param, char *buf, uint32_t len) const
 	}
 }
 
-boost::shared_ptr<Plugin::ScalePoints>
+boost::shared_ptr<ScalePoints>
 LadspaPlugin::get_scale_points(uint32_t port_index) const
 {
-	boost::shared_ptr<Plugin::ScalePoints> ret;
+	boost::shared_ptr<ScalePoints> ret;
 #ifdef HAVE_LRDF
 	const uint32_t id     = atol(unique_id().c_str());
 	lrdf_defaults* points = lrdf_get_scale_values(id, port_index);
@@ -650,7 +654,7 @@ LadspaPlugin::get_scale_points(uint32_t port_index) const
 		return ret;
 	}
 
-	ret = boost::shared_ptr<Plugin::ScalePoints>(new ScalePoints());
+	ret = boost::shared_ptr<ScalePoints>(new ScalePoints());
 
 	for (uint32_t i = 0; i < points->count; ++i) {
 		ret->insert(make_pair(points->items[i].label,
@@ -788,11 +792,11 @@ LadspaPlugin::load_preset (PresetRecord r)
 	return true;
 }
 
+#ifdef HAVE_LRDF
 /* XXX: should be in liblrdf */
 static void
 lrdf_remove_preset (const char* /*source*/, const char *setting_uri)
 {
-#ifdef HAVE_LRDF
 	lrdf_statement p;
 	lrdf_statement *q;
 	lrdf_statement *i;
@@ -826,8 +830,8 @@ lrdf_remove_preset (const char* /*source*/, const char *setting_uri)
 	p.predicate = NULL;
 	p.object = NULL;
 	lrdf_remove_matches (&p);
-#endif
 }
+#endif
 
 void
 LadspaPlugin::do_remove_preset (string name)