Use XMLNode::set_property API in PBD::StatefulDiffCommand class

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

diff --git a/libs/pbd/controllable.cc b/libs/pbd/controllable.cc
index ba6b32282b9d74e3999d5df06be4528203d35f3a..60e43ab68812b0c000ad58bb0879aaa01c6b8082 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
@@ -18,47 +18,61 @@
 */
 
 #include "pbd/controllable.h"
+#include "pbd/enumwriter.h"
 #include "pbd/xml++.h"
 #include "pbd/error.h"
+#include "pbd/locale_guard.h"
+#include "pbd/types_convert.h"
+#include "pbd/string_convert.h"
 
-#include "i18n.h"
+#include "pbd/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::Threads::RWLock Controllable::registry_lock;
 Controllable::Controllables Controllable::registry;
+PBD::ScopedConnectionList* registry_connections = 0;
+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::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));
 }
 
 void
-Controllable::remove ()
+Controllable::remove (Controllable* ctl)
 {
-       Glib::Mutex::Lock lm (*registry_lock);
+       Glib::Threads::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 +82,7 @@ Controllable::remove ()
 Controllable*
 Controllable::by_id (const ID& id)
 {
-       Glib::Mutex::Lock lm (*registry_lock);
+       Glib::Threads::RWLock::ReaderLock lm (registry_lock);
 
        for (Controllables::iterator i = registry.begin(); i != registry.end(); ++i) {
                if ((*i)->id() == id) {
@@ -78,11 +92,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::Threads::RWLock::ReaderLock lm (registry_lock);
 
        for (Controllables::iterator i = registry.begin(); i != registry.end(); ++i) {
                if ((*i)->_name == str) {
@@ -95,25 +108,52 @@ Controllable::by_name (const std::string& str)
 XMLNode&
 Controllable::get_state ()
 {
-       XMLNode* node = new XMLNode (X_("Controllable"));
-       char buf[64];
+       XMLNode* node = new XMLNode (xml_node_name);
+       LocaleGuard lg;
+
+       /* 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);
+       }
 
-       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);
        return *node;
 }
 
 int
-Controllable::set_state (const XMLNode& node)
+Controllable::set_state (const XMLNode& node, int /*version*/)
 {
-       const XMLProperty* prop = node.property (X_("id"));
-
-       if (prop) {
-               _id = prop->value();
-               return 0;
-       } else {
-               error << _("Controllable state node has no ID property") << endmsg;
-               return -1;
+       LocaleGuard lg;
+
+       Stateful::save_extra_xml (node);
+
+       set_id (node);
+
+       if (node.get_property (X_("flags"), _flags)) {
+               _flags = Flag(_flags | (_flags & Controllable::RealTime));
+       }
+
+       float val;
+       if (node.get_property (X_("value"), val)) {
+                       set_value (val, NoGroup);
        }
+       return 0;
+}
+
+void
+Controllable::set_flags (Flag f)
+{
+       _flags = f;
 }