X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Frc_configuration.cc;h=4651fa3341e43415695fe56f559f86039dea7688;hb=cb51c4c5aa1717d1e37f370b3610e4f8f7b1e0bf;hp=9fdd6aa1ad606639f900c0b20920d9c8f0719a6b;hpb=3b2c23be93d70aaaedf5f36a4322d132f1ca5494;p=ardour.git

diff --git a/libs/ardour/rc_configuration.cc b/libs/ardour/rc_configuration.cc
index 9fdd6aa1ad..4651fa3341 100644
--- a/libs/ardour/rc_configuration.cc
+++ b/libs/ardour/rc_configuration.cc
@@ -21,21 +21,24 @@
 #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/disk_reader.h"
+#include "ardour/disk_writer.h"
 #include "ardour/control_protocol_manager.h"
-#include "ardour/diskstream.h"
 #include "ardour/filesystem_paths.h"
 #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;
@@ -88,7 +91,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 +119,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 +174,6 @@ XMLNode&
 RCConfiguration::get_state ()
 {
 	XMLNode* root;
-	LocaleGuard lg (X_("C"));
 
 	root = new XMLNode("Ardour");
 
@@ -192,7 +194,6 @@ XMLNode&
 RCConfiguration::get_variables ()
 {
 	XMLNode* node;
-	LocaleGuard lg (X_("C"));
 
 	node = new XMLNode ("Config");
 
@@ -235,8 +236,8 @@ RCConfiguration::set_state (const XMLNode& root, int version)
 		}
 	}
 
-	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));
+	DiskReader::set_chunk_samples (minimum_disk_read_bytes.get() / sizeof (Sample));
+	DiskWriter::set_chunk_samples (minimum_disk_write_bytes.get() / sizeof (Sample));
 
 	return 0;
 }