Add locale independent and thread safe string conversion API with tests

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

diff --git a/libs/pbd/controllable.cc b/libs/pbd/controllable.cc
index 6b92e84926332eebea63d2d7c8c7771e629e81d3..a2e6265927037065db07855dbfe3021828be3d77 100644 (file)
--- a/libs/pbd/controllable.cc
+++ b/libs/pbd/controllable.cc
@@ -23,7 +23,7 @@
 #include "pbd/error.h"
 #include "pbd/locale_guard.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace PBD;
 using namespace std;
@@ -124,7 +124,7 @@ Controllable::get_state ()
        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());
+       snprintf (buf, sizeof (buf), "%2.12f", get_save_value());
         node->add_property (X_("value"), buf);
 
        if (_extra_xml) {
@@ -134,7 +134,6 @@ Controllable::get_state ()
        return *node;
 }
 
-
 int
 Controllable::set_state (const XMLNode& node, int /*version*/)
 {
@@ -146,7 +145,7 @@ Controllable::set_state (const XMLNode& node, int /*version*/)
        set_id (node);
 
        if ((prop = node.property (X_("flags"))) != 0) {
-               _flags = (Flag) string_2_enum (prop->value(), _flags);
+               _flags = (Flag) ((_flags & Controllable::RealTime) | string_2_enum (prop->value(), _flags));
        }
 
        if ((prop = node.property (X_("value"))) != 0) {