#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"
#include "ardour/rc_configuration.h"
#include "ardour/session_metadata.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace ARDOUR;
using namespace std;
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 */
/* 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 */
}
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())) {
/* 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 */
}
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)) {
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()) {
RCConfiguration::get_state ()
{
XMLNode* root;
- LocaleGuard lg (X_("POSIX"));
+ LocaleGuard lg;
root = new XMLNode("Ardour");
RCConfiguration::get_variables ()
{
XMLNode* node;
- LocaleGuard lg (X_("POSIX"));
+ LocaleGuard lg;
node = new XMLNode ("Config");
XMLNodeList nlist = root.children();
XMLNodeConstIterator niter;
XMLNode *node;
+ LocaleGuard lg;
Stateful::save_extra_xml (root);
}
}
- 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;
}
#undef CONFIG_VARIABLE
#undef CONFIG_VARIABLE_SPECIAL
}
+