more or less complete restoration of Controllable::_id from XML, with all that implie...

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

diff --git a/libs/pbd/controllable.cc b/libs/pbd/controllable.cc
index a1cd6505400f084845b0b8f2cff46b6ce0a1a1f2..0112ff2b1ccabf76200fdcf30a94e24a196eeac9 100644 (file)
--- a/libs/pbd/controllable.cc
+++ b/libs/pbd/controllable.cc
@@ -18,47 +18,55 @@
 */
 
 #include "pbd/controllable.h"
+#include "pbd/enumwriter.h"
 #include "pbd/xml++.h"
 #include "pbd/error.h"
+#include "pbd/locale_guard.h"
 
 #include "i18n.h"
 
 using namespace PBD;
+using namespace std;
 
-sigc::signal<void,Controllable*> Controllable::Destroyed;
-sigc::signal<bool,Controllable*> Controllable::StartLearning;
-sigc::signal<void,Controllable*> Controllable::StopLearning;
-sigc::signal<void,Controllable*,int,int> Controllable::CreateBinding;
-sigc::signal<void,Controllable*> Controllable::DeleteBinding;
+PBD::Signal1<void,Controllable*> Controllable::Destroyed;
+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;
 
-Glib::Mutex* Controllable::registry_lock = 0;
+Glib::StaticRWLock Controllable::registry_lock = GLIBMM_STATIC_RW_LOCK_INIT;
 Controllable::Controllables Controllable::registry;
+PBD::ScopedConnectionList registry_connections;
+const std::string Controllable::xml_node_name = X_("Controllable");
 
-Controllable::Controllable (std::string name)
+Controllable::Controllable (const string& name, Flag f)
        : _name (name)
+       , _flags (f)
        , _touching (false)
 {
-       if (registry_lock == 0) {
-               registry_lock = new Glib::Mutex;
-       }
-
-       add ();
+       add (*this);
 }
 
 void
-Controllable::add ()
+Controllable::add (Controllable& ctl)
 {
-       Glib::Mutex::Lock lm (*registry_lock);
-       registry.insert (this);
-       this->GoingAway.connect (mem_fun (this, &Controllable::remove));
+       using namespace boost;
+
+       Glib::RWLock::WriterLock lm (registry_lock);
+       registry.insert (&ctl);
+
+       /* Controllable::remove() is static - no need to manage this connection */
+
+       ctl.DropReferences.connect_same_thread (registry_connections, boost::bind (&Controllable::remove, &ctl));
 }
 
 void
-Controllable::remove ()
+Controllable::remove (Controllable* ctl)
 {
-       Glib::Mutex::Lock lm (*registry_lock);
+       Glib::RWLock::WriterLock lm (registry_lock);
+
        for (Controllables::iterator i = registry.begin(); i != registry.end(); ++i) {
-               if ((*i) == this) {
+               if ((*i) == ctl) {
                        registry.erase (i);
                        break;
                }
@@ -68,7 +76,7 @@ Controllable::remove ()
 Controllable*
 Controllable::by_id (const ID& id)
 {
-       Glib::Mutex::Lock lm (*registry_lock);
+       Glib::RWLock::ReaderLock lm (registry_lock);
 
        for (Controllables::iterator i = registry.begin(); i != registry.end(); ++i) {
                if ((*i)->id() == id) {
@@ -78,11 +86,10 @@ Controllable::by_id (const ID& id)
        return 0;
 }
 
-
 Controllable*
-Controllable::by_name (const std::string& str)
+Controllable::by_name (const string& str)
 {
-       Glib::Mutex::Lock lm (*registry_lock);
+       Glib::RWLock::ReaderLock lm (registry_lock);
 
        for (Controllables::iterator i = registry.begin(); i != registry.end(); ++i) {
                if ((*i)->_name == str) {
@@ -95,25 +102,51 @@ Controllable::by_name (const std::string& str)
 XMLNode&
 Controllable::get_state ()
 {
-       XMLNode* node = new XMLNode (X_("Controllable"));
+       XMLNode* node = new XMLNode (xml_node_name);
+       LocaleGuard lg (X_("POSIX"));
        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);
+
        return *node;
 }
 
+
 int
 Controllable::set_state (const XMLNode& node, int /*version*/)
 {
-       const XMLProperty* prop = node.property (X_("id"));
+       LocaleGuard lg (X_("POSIX"));
+       const XMLProperty* prop;
 
-       if (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;
        }
+
+       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);
+               } 
+        }
+
+        return 0;
+}
+
+void
+Controllable::set_flags (Flag f)
+{
+       _flags = f;
 }