add to LUA API (new Stripable API)

[ardour.git] / libs / pbd / controllable.cc

diff --git a/libs/pbd/controllable.cc b/libs/pbd/controllable.cc
index b79a523a0046de5ecff83e7c8d356e52e6ebca2b..c289ee0287db76d51427c9445eb73ddf69edfd1c 100644 (file)
--- 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,8 +21,10 @@
 #include "pbd/enumwriter.h"
 #include "pbd/xml++.h"
 #include "pbd/error.h"
+#include "pbd/types_convert.h"
+#include "pbd/string_convert.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace PBD;
 using namespace std;
@@ -32,10 +34,11 @@ PBD::Signal1<bool,Controllable*> Controllable::StartLearning;
 PBD::Signal1<void,Controllable*> Controllable::StopLearning;
 PBD::Signal3<void,Controllable*,int,int> Controllable::CreateBinding;
 PBD::Signal1<void,Controllable*> Controllable::DeleteBinding;
+PBD::Signal1<void, boost::weak_ptr<PBD::Controllable> > Controllable::GUIFocusChanged;
 
-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)
@@ -51,18 +54,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) {
@@ -75,7 +82,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) {
@@ -88,7 +95,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) {
@@ -102,14 +109,24 @@ XMLNode&
 Controllable::get_state ()
 {
        XMLNode* node = new XMLNode (xml_node_name);
-       char buf[64];
 
-       node->add_property (X_("name"), _name); // not reloaded from XML state, just there to look at
-       _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);
+       /* 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->set_property (X_("name"), _name);
+       node->set_property (X_("id"), id());
+       node->set_property (X_("flags"), _flags);
+       node->set_property (X_("value"), get_save_value());
+
+       if (_extra_xml) {
+               node->add_child_copy (*_extra_xml);
+       }
 
        return *node;
 }
@@ -117,27 +134,19 @@ Controllable::get_state ()
 int
 Controllable::set_state (const XMLNode& node, int /*version*/)
 {
-       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);
 
-       if ((prop = node.property (X_("flags"))) != 0) {
-               _flags = (Flag) string_2_enum (prop->value(), _flags);
-       }
+       set_id (node);
 
-       if ((prop = node.property (X_("value"))) != 0) {
-               float val;
+       if (node.get_property (X_("flags"), _flags)) {
+               _flags = Flag(_flags | (_flags & Controllable::RealTime));
+       }
 
-               if (sscanf (prop->value().c_str(), "%f", &val) == 1) {
-                       set_value (val);
-               }
+       float val;
+       if (node.get_property (X_("value"), val)) {
+                       set_value (val, NoGroup);
        }
+       return 0;
 }
 
 void