#include <glib/gstdio.h> /* for g_stat() */
#include <glibmm/miscutils.h>
-#include "pbd/failed_constructor.h"
#include "pbd/xml++.h"
-#include "pbd/filesystem.h"
#include "pbd/file_utils.h"
#include "midi++/manager.h"
-#include "ardour/ardour.h"
-#include "ardour/rc_configuration.h"
-#include "ardour/audio_diskstream.h"
#include "ardour/control_protocol_manager.h"
+#include "ardour/diskstream.h"
#include "ardour/filesystem_paths.h"
+#include "ardour/rc_configuration.h"
#include "ardour/session_metadata.h"
#include "i18n.h"
int
RCConfiguration::load_state ()
{
- sys::path system_rc_file;
+ std::string rcfile;
struct stat statbuf;
/* load system configuration first */
- if (find_file_in_search_path (ardour_search_path() + system_config_search_path(), "ardour_system.rc", system_rc_file)) {
- string rcfile = system_rc_file.to_string();
+ if (find_file_in_search_path (ardour_config_search_path(), "ardour_system.rc", rcfile)) {
/* stupid XML Parser hates empty files */
return -1;
}
} else {
- error << string_compose (_("your system %1 configuration file is empty. This probably means that there as an error installing %1"), PROGRAM_NAME) << endmsg;
+ error << string_compose (_("Your system %1 configuration file is empty. This probably means that there was an error installing %1"), PROGRAM_NAME) << endmsg;
}
}
/* now load configuration file for user */
- sys::path user_rc_file;
-
- if (find_file_in_search_path (ardour_search_path() + user_config_directory(), "ardour.rc", user_rc_file)) {
- string rcfile = user_rc_file.to_string();
+ if (find_file_in_search_path (ardour_config_search_path(), "ardour.rc", rcfile)) {
/* stupid XML parser hates empty files */
int
RCConfiguration::save_state()
{
- try
- {
- sys::create_directories (user_config_directory ());
- }
- catch (const sys::filesystem_error& ex)
- {
- error << "Could not create user configuration directory" << endmsg;
- return -1;
- }
-
- sys::path rcfile_path(user_config_directory());
-
- rcfile_path /= "ardour.rc";
- const string rcfile = rcfile_path.to_string();
+ const std::string rcfile = Glib::build_filename (user_config_directory(), "ardour.rc");
// this test seems bogus?
if (!rcfile.empty()) {