X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Frc_configuration.cc;h=d1e80e75ef2602bc7115a0578435a81ca395fe5b;hb=8f8a4878f30795b7ac5398c8daa6b01b5c6d4468;hp=b0be237563b4bb97c6184838cde61750da3c6bd0;hpb=e5e12acc5698090f2c0c614385e457cc0b46fbb0;p=ardour.git diff --git a/libs/ardour/rc_configuration.cc b/libs/ardour/rc_configuration.cc index b0be237563..d1e80e75ef 100644 --- 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 } +static const char* user_config_file_name = "config"; +static const char* system_config_file_name = "system_config"; + RCConfiguration::RCConfiguration () : /* construct variables */ @@ -76,7 +79,7 @@ RCConfiguration::load_state () /* 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 */ @@ -104,7 +107,7 @@ RCConfiguration::load_state () /* 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 */ @@ -136,7 +139,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()) {