projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean up some MIDI code.
[ardour.git]
/
libs
/
ardour
/
rc_configuration.cc
diff --git
a/libs/ardour/rc_configuration.cc
b/libs/ardour/rc_configuration.cc
index b0be237563b4bb97c6184838cde61750da3c6bd0..d1e80e75ef2602bc7115a0578435a81ca395fe5b 100644
(file)
--- a/
libs/ardour/rc_configuration.cc
+++ b/
libs/ardour/rc_configuration.cc
@@
-49,6
+49,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
+79,7
@@
RCConfiguration::load_state ()
/* load system configuration first */
/* load system configuration first */
- if (find_file (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
+107,7
@@
RCConfiguration::load_state ()
/* now load configuration file for user */
/* now load configuration file for user */
- if (find_file (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
+139,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()) {