X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Frc_configuration.cc;h=2abf3477fb58a63147f58e2e311218790b9a73f0;hb=489753e866eba93e1263f61b716c31ca80a32181;hp=071d50ac0308ca904ace062b82b4c3307adb85c6;hpb=6bcdf4f0f106d0b83ed7f221f546c132585e19e7;p=ardour.git

diff --git a/libs/ardour/rc_configuration.cc b/libs/ardour/rc_configuration.cc
index 071d50ac03..2abf3477fb 100644
--- 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"
@@ -49,6 +50,9 @@ namespace ARDOUR {
     float speed_quietning = 0.251189; // -12dB reduction for ffwd or rewind
 }
 
+static const char* user_config_file_name = "config";
+static const char* system_config_file_name = "system_config";
+
 RCConfiguration::RCConfiguration ()
 	:
 /* construct variables */
@@ -65,10 +69,6 @@ RCConfiguration::RCConfiguration ()
 
 RCConfiguration::~RCConfiguration ()
 {
-	for (list<XMLNode*>::iterator i = _midi_port_states.begin(); i != _midi_port_states.end(); ++i) {
-		delete *i;
-	}
-
 	delete _control_protocol_state;
 }
 
@@ -76,11 +76,11 @@ int
 RCConfiguration::load_state ()
 {
 	std::string rcfile;
-	struct stat statbuf;
+	GStatBuf statbuf;
 
 	/* load system configuration first */
 
-	if (find_file_in_search_path (ardour_config_search_path(), "ardour_system.rc", rcfile)) {
+	if (find_file (ardour_config_search_path(), system_config_file_name, rcfile)) {
 
 		/* stupid XML Parser hates empty files */
 
@@ -108,7 +108,7 @@ RCConfiguration::load_state ()
 
 	/* now load configuration file for user */
 
-	if (find_file_in_search_path (ardour_config_search_path(), "ardour.rc", rcfile)) {
+	if (find_file (ardour_config_search_path(), user_config_file_name, rcfile)) {
 
 		/* stupid XML parser hates empty files */
 
@@ -140,7 +140,7 @@ RCConfiguration::load_state ()
 int
 RCConfiguration::save_state()
 {
-	const std::string rcfile = Glib::build_filename (user_config_directory(), "ardour.rc");
+	const std::string rcfile = Glib::build_filename (user_config_directory(), user_config_file_name);
 
 	// this test seems bogus?
 	if (!rcfile.empty()) {
@@ -172,15 +172,10 @@ XMLNode&
 RCConfiguration::get_state ()
 {
 	XMLNode* root;
-	LocaleGuard lg (X_("POSIX"));
+	LocaleGuard lg (X_("C"));
 
 	root = new XMLNode("Ardour");
 
-	list<XMLNode*> midi_port_nodes = AudioEngine::instance()->get_midi_port_states();
-	for (list<XMLNode*>::const_iterator n = midi_port_nodes.begin(); n != midi_port_nodes.end(); ++n) {
-		 root->add_child_nocopy (**n);
-	}
-
 	root->add_child_nocopy (get_variables ());
 
 	root->add_child_nocopy (SessionMetadata::Metadata()->get_user_state());
@@ -198,7 +193,7 @@ XMLNode&
 RCConfiguration::get_variables ()
 {
 	XMLNode* node;
-	LocaleGuard lg (X_("POSIX"));
+	LocaleGuard lg (X_("C"));
 
 	node = new XMLNode ("Config");
 
@@ -226,12 +221,6 @@ RCConfiguration::set_state (const XMLNode& root, int version)
 	XMLNodeConstIterator niter;
 	XMLNode *node;
 
-	for (list<XMLNode*>::iterator i = _midi_port_states.begin(); i != _midi_port_states.end(); ++i) {
-		delete *i;
-	}
-
-	_midi_port_states.clear ();
-
 	Stateful::save_extra_xml (root);
 
 	for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
@@ -244,12 +233,11 @@ RCConfiguration::set_state (const XMLNode& root, int version)
 			SessionMetadata::Metadata()->set_state (*node, version);
 		} else if (node->name() == ControlProtocolManager::state_node_name) {
 			_control_protocol_state = new XMLNode (*node);
-		} else if (node->name() == ARDOUR::Port::state_node_name) {
-			_midi_port_states.push_back (new XMLNode (*node));
 		}
 	}
 
-	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;
 }
@@ -284,3 +272,4 @@ RCConfiguration::map_parameters (boost::function<void (std::string)>& functor)
 #undef  CONFIG_VARIABLE
 #undef  CONFIG_VARIABLE_SPECIAL
 }
+