initial, prototype modifications to permit compilation of local libraries as static...

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

diff --git a/libs/pbd/controllable.cc b/libs/pbd/controllable.cc
index 959abe443d9c8e9d93b9ae3e207f3e7a9ec276a9..42e015ac6f90a6d179841ba25cd96a42d7f3ad52 100644 (file)
--- a/libs/pbd/controllable.cc
+++ b/libs/pbd/controllable.cc
@@ -34,9 +34,9 @@ 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)
@@ -52,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) {
@@ -76,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) {
@@ -89,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) {
@@ -107,7 +111,7 @@ Controllable::get_state ()
        char buf[64];
 
        node->add_property (X_("name"), _name); // not reloaded from XML state, just there to look at
-       _id.print (buf, sizeof (buf));
+       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());
@@ -129,12 +133,7 @@ Controllable::set_state (const XMLNode& node, int /*version*/)
 
        Stateful::save_extra_xml (node);
 
-       if ((prop = node.property (X_("id"))) != 0) {
-               _id = prop->value();
-       } else {
-               error << _("Controllable state node has no ID property") << endmsg;
-               return -1;
-       }
+       set_id (node);
 
        if ((prop = node.property (X_("flags"))) != 0) {
                _flags = (Flag) string_2_enum (prop->value(), _flags);