projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
specialize isfinite for MSVC compat
[ardour.git]
/
libs
/
ardour
/
rc_configuration.cc
diff --git
a/libs/ardour/rc_configuration.cc
b/libs/ardour/rc_configuration.cc
index 7fe030fb7e0102e3d39acc2a44586f45f253900f..2abf3477fb58a63147f58e2e311218790b9a73f0 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 <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 <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/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
}
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 */
RCConfiguration::RCConfiguration ()
:
/* construct variables */
@@
-76,7
+80,7
@@
RCConfiguration::load_state ()
/* load system configuration first */
/* 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 */
/* stupid XML Parser hates empty files */
@@
-104,7
+108,7
@@
RCConfiguration::load_state ()
/* now load configuration file for user */
/* 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 */
/* stupid XML parser hates empty files */
@@
-136,7
+140,7
@@
RCConfiguration::load_state ()
int
RCConfiguration::save_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()) {
// this test seems bogus?
if (!rcfile.empty()) {
@@
-168,7
+172,7
@@
XMLNode&
RCConfiguration::get_state ()
{
XMLNode* root;
RCConfiguration::get_state ()
{
XMLNode* root;
- LocaleGuard lg (X_("
POSIX
"));
+ LocaleGuard lg (X_("
C
"));
root = new XMLNode("Ardour");
root = new XMLNode("Ardour");
@@
-189,7
+193,7
@@
XMLNode&
RCConfiguration::get_variables ()
{
XMLNode* node;
RCConfiguration::get_variables ()
{
XMLNode* node;
- LocaleGuard lg (X_("
POSIX
"));
+ LocaleGuard lg (X_("
C
"));
node = new XMLNode ("Config");
node = new XMLNode ("Config");
@@
-232,7
+236,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;
}
return 0;
}
@@
-267,3
+272,4
@@
RCConfiguration::map_parameters (boost::function<void (std::string)>& functor)
#undef CONFIG_VARIABLE
#undef CONFIG_VARIABLE_SPECIAL
}
#undef CONFIG_VARIABLE
#undef CONFIG_VARIABLE_SPECIAL
}
+