X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpbd%2Fcontrollable.cc;h=6b92e84926332eebea63d2d7c8c7771e629e81d3;hb=7dfd39e708233b618c7911eb66e49625c60d4d1c;hp=d5b81a73ed0eeebd13453f60eae65131e84f8253;hpb=74933f58659051f6d4ef52d1103b2b7ba4643883;p=ardour.git

diff --git a/libs/pbd/controllable.cc b/libs/pbd/controllable.cc
index d5b81a73ed..6b92e84926 100644
--- a/libs/pbd/controllable.cc
+++ b/libs/pbd/controllable.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2007 Paul Davis 
+    Copyright (C) 2000-2007 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 #include "pbd/enumwriter.h"
 #include "pbd/xml++.h"
 #include "pbd/error.h"
+#include "pbd/locale_guard.h"
 
 #include "i18n.h"
 
@@ -33,13 +34,15 @@ PBD::Signal1<void,Controllable*> Controllable::StopLearning;
 PBD::Signal3<void,Controllable*,int,int> Controllable::CreateBinding;
 PBD::Signal1<void,Controllable*> Controllable::DeleteBinding;
 
-Glib::StaticRWLock Controllable::registry_lock = GLIBMM_STATIC_RW_LOCK_INIT;
+Glib::Threads::RWLock Controllable::registry_lock;
 Controllable::Controllables Controllable::registry;
-PBD::ScopedConnectionList registry_connections;
+PBD::ScopedConnectionList* registry_connections = 0;
+const std::string Controllable::xml_node_name = X_("Controllable");
 
 Controllable::Controllable (const string& name, Flag f)
 	: _name (name)
 	, _flags (f)
+	, _touching (false)
 {
 	add (*this);
 }
@@ -49,18 +52,22 @@ Controllable::add (Controllable& ctl)
 {
 	using namespace boost;
 
-	Glib::RWLock::WriterLock lm (registry_lock);
+	Glib::Threads::RWLock::WriterLock lm (registry_lock);
 	registry.insert (&ctl);
 
+	if (!registry_connections) {
+		registry_connections = new ScopedConnectionList;
+	}
+
 	/* Controllable::remove() is static - no need to manage this connection */
 
-	ctl.DropReferences.connect_same_thread (registry_connections, boost::bind (&Controllable::remove, &ctl));
+	ctl.DropReferences.connect_same_thread (*registry_connections, boost::bind (&Controllable::remove, &ctl));
 }
 
 void
 Controllable::remove (Controllable* ctl)
 {
-	Glib::RWLock::WriterLock lm (registry_lock);
+	Glib::Threads::RWLock::WriterLock lm (registry_lock);
 
 	for (Controllables::iterator i = registry.begin(); i != registry.end(); ++i) {
 		if ((*i) == ctl) {
@@ -73,7 +80,7 @@ Controllable::remove (Controllable* ctl)
 Controllable*
 Controllable::by_id (const ID& id)
 {
-	Glib::RWLock::ReaderLock lm (registry_lock);
+	Glib::Threads::RWLock::ReaderLock lm (registry_lock);
 
 	for (Controllables::iterator i = registry.begin(); i != registry.end(); ++i) {
 		if ((*i)->id() == id) {
@@ -86,7 +93,7 @@ Controllable::by_id (const ID& id)
 Controllable*
 Controllable::by_name (const string& str)
 {
-	Glib::RWLock::ReaderLock lm (registry_lock);
+	Glib::Threads::RWLock::ReaderLock lm (registry_lock);
 
 	for (Controllables::iterator i = registry.begin(); i != registry.end(); ++i) {
 		if ((*i)->_name == str) {
@@ -99,33 +106,58 @@ Controllable::by_name (const string& str)
 XMLNode&
 Controllable::get_state ()
 {
-	XMLNode* node = new XMLNode (X_("Controllable"));
+	XMLNode* node = new XMLNode (xml_node_name);
+	LocaleGuard lg;
 	char buf[64];
 
-	node->add_property (X_("name"), _name); // not reloaded from XML state, just there to look at
-	_id.print (buf, sizeof (buf));
+	/* Waves' "Pressure3" has a parameter called "µ-iness"
+	 * which causes a  parser error : Input is not proper UTF-8, indicate encoding !
+	 *  Bytes: 0xB5 0x2D 0x69 0x6E
+	 *          <Controllable name="�-iness" id="2391" flags="" value="0.000000000000" p
+	 */
+
+	// this is not reloaded from XML, but it must be present because it is
+	// used to find and identify XML nodes by various Controllable-derived objects
+
+	node->add_property (X_("name"), _name);
+
+	id().print (buf, sizeof (buf));
 	node->add_property (X_("id"), buf);
 	node->add_property (X_("flags"), enum_2_string (_flags));
+	snprintf (buf, sizeof (buf), "%2.12f", get_value());
+        node->add_property (X_("value"), buf);
+
+	if (_extra_xml) {
+		node->add_child_copy (*_extra_xml);
+	}
 
 	return *node;
 }
 
+
 int
 Controllable::set_state (const XMLNode& node, int /*version*/)
 {
+	LocaleGuard lg;
 	const XMLProperty* prop;
 
-	if ((prop = node.property (X_("id"))) != 0) {
-		_id = prop->value();
-		return 0;
-	} else {
-		error << _("Controllable state node has no ID property") << endmsg;
-		return -1;
-	}
+	Stateful::save_extra_xml (node);
+
+	set_id (node);
 
 	if ((prop = node.property (X_("flags"))) != 0) {
 		_flags = (Flag) string_2_enum (prop->value(), _flags);
 	}
+
+	if ((prop = node.property (X_("value"))) != 0) {
+		float val;
+
+		if (sscanf (prop->value().c_str(), "%f", &val) == 1) {
+			set_value (val, NoGroup);
+		}
+        }
+
+        return 0;
 }
 
 void