a-EQ: Revert one of the previous changes

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

diff --git a/libs/pbd/controllable.cc b/libs/pbd/controllable.cc
index 17b81334f0b07e95a6547c8a4956a38bf4660e9d..60e43ab68812b0c000ad58bb0879aaa01c6b8082 100644 (file)
--- a/libs/pbd/controllable.cc
+++ b/libs/pbd/controllable.cc
@@ -22,8 +22,10 @@
 #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;
@@ -107,15 +109,21 @@ XMLNode&
 Controllable::get_state ()
 {
        XMLNode* node = new XMLNode (xml_node_name);
-       LocaleGuard lg (X_("C"));
-       char buf[64];
+       LocaleGuard lg;
 
-       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);
@@ -124,30 +132,24 @@ Controllable::get_state ()
        return *node;
 }
 
-
 int
 Controllable::set_state (const XMLNode& node, int /*version*/)
 {
-       LocaleGuard lg (X_("C"));
-       const XMLProperty* prop;
+       LocaleGuard lg;
 
        Stateful::save_extra_xml (node);
 
        set_id (node);
 
-       if ((prop = node.property (X_("flags"))) != 0) {
-               _flags = (Flag) string_2_enum (prop->value(), _flags);
+       if (node.get_property (X_("flags"), _flags)) {
+               _flags = Flag(_flags | (_flags & Controllable::RealTime));
        }
 
-       if ((prop = node.property (X_("value"))) != 0) {
-               float val;
-
-               if (sscanf (prop->value().c_str(), "%f", &val) == 1) {
-                       set_value (val);
-               }
-        }
-
-        return 0;
+       float val;
+       if (node.get_property (X_("value"), val)) {
+                       set_value (val, NoGroup);
+       }
+       return 0;
 }
 
 void