Merge event control lists when disconnecting a master-ctrl

[ardour.git] / libs / ardour / rc_configuration.cc

diff --git a/libs/ardour/rc_configuration.cc b/libs/ardour/rc_configuration.cc
index 2abf3477fb58a63147f58e2e311218790b9a73f0..e16bf40fb7b0ca274b8574a28b56629e8d8e4063 100644 (file)
--- a/libs/ardour/rc_configuration.cc
+++ b/libs/ardour/rc_configuration.cc
@@ -35,8 +35,9 @@
 #include "ardour/port.h"
 #include "ardour/rc_configuration.h"
 #include "ardour/session_metadata.h"
+#include "ardour/types_convert.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace std;
@@ -89,7 +90,7 @@ RCConfiguration::load_state ()
                }
 
                if (statbuf.st_size != 0) {
-                       info << string_compose (_("Loading system configuration file %1"), rcfile) << endl;
+                       info << string_compose (_("Loading system configuration file %1"), rcfile) << endmsg;
 
                        XMLTree tree;
                        if (!tree.read (rcfile.c_str())) {
@@ -117,7 +118,7 @@ RCConfiguration::load_state ()
                }
 
                if (statbuf.st_size != 0) {
-                       info << string_compose (_("Loading user configuration file %1"), rcfile) << endl;
+                       info << string_compose (_("Loading user configuration file %1"), rcfile) << endmsg;
 
                        XMLTree tree;
                        if (!tree.read (rcfile)) {
@@ -172,7 +173,7 @@ XMLNode&
 RCConfiguration::get_state ()
 {
        XMLNode* root;
-       LocaleGuard lg (X_("C"));
+       LocaleGuard lg;
 
        root = new XMLNode("Ardour");
 
@@ -193,7 +194,7 @@ XMLNode&
 RCConfiguration::get_variables ()
 {
        XMLNode* node;
-       LocaleGuard lg (X_("C"));
+       LocaleGuard lg;
 
        node = new XMLNode ("Config");
 
@@ -220,6 +221,7 @@ RCConfiguration::set_state (const XMLNode& root, int version)
        XMLNodeList nlist = root.children();
        XMLNodeConstIterator niter;
        XMLNode *node;
+       LocaleGuard lg;
 
        Stateful::save_extra_xml (root);