Lua add an Empty/Nil shared-pointer constructor

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

diff --git a/libs/ardour/rc_configuration.cc b/libs/ardour/rc_configuration.cc
index d1e80e75ef2602bc7115a0578435a81ca395fe5b..7fc2f5105b6755ed7906c0d1d7f9f781c1e417f1 100644 (file)
--- a/libs/ardour/rc_configuration.cc
+++ b/libs/ardour/rc_configuration.cc
@@ -21,11 +21,12 @@
 #include <cstdio> /* for snprintf, grrr */
 
 #include <glib.h>
-#include <glib/gstdio.h> /* for g_stat() */
+#include "pbd/gstdio_compat.h"
 #include <glibmm/miscutils.h>
 
 #include "pbd/xml++.h"
 #include "pbd/file_utils.h"
+#include "pbd/replace_all.h"
 
 #include "ardour/audioengine.h"
 #include "ardour/control_protocol_manager.h"
@@ -35,7 +36,7 @@
 #include "ardour/rc_configuration.h"
 #include "ardour/session_metadata.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace std;
@@ -88,7 +89,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())) {
@@ -116,7 +117,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)) {
@@ -171,7 +172,7 @@ XMLNode&
 RCConfiguration::get_state ()
 {
        XMLNode* root;
-       LocaleGuard lg (X_("POSIX"));
+       LocaleGuard lg;
 
        root = new XMLNode("Ardour");
 
@@ -192,7 +193,7 @@ XMLNode&
 RCConfiguration::get_variables ()
 {
        XMLNode* node;
-       LocaleGuard lg (X_("POSIX"));
+       LocaleGuard lg;
 
        node = new XMLNode ("Config");
 
@@ -219,6 +220,7 @@ RCConfiguration::set_state (const XMLNode& root, int version)
        XMLNodeList nlist = root.children();
        XMLNodeConstIterator niter;
        XMLNode *node;
+       LocaleGuard lg;
 
        Stateful::save_extra_xml (root);
 
@@ -235,7 +237,8 @@ RCConfiguration::set_state (const XMLNode& root, int version)
                }
        }
 
-       Diskstream::set_disk_io_chunk_frames (minimum_disk_io_bytes.get() / sizeof (Sample));
+       Diskstream::set_disk_read_chunk_frames (minimum_disk_read_bytes.get() / sizeof (Sample));
+       Diskstream::set_disk_write_chunk_frames (minimum_disk_write_bytes.get() / sizeof (Sample));
 
        return 0;
 }
@@ -270,3 +273,4 @@ RCConfiguration::map_parameters (boost::function<void (std::string)>& functor)
 #undef  CONFIG_VARIABLE
 #undef  CONFIG_VARIABLE_SPECIAL
 }
+