#include "pbd/failed_constructor.h"
#include "pbd/xml++.h"
-#include "pbd/filesystem.h"
#include "pbd/file_utils.h"
#include "pbd/error.h"
#include "gtkmm2ext/rgb_macros.h"
-#include "ardour/ardour.h"
#include "ardour/filesystem_paths.h"
#include "ui_config.h"
{
int found = 0;
- sys::path default_ui_rc_file;
+ std::string default_ui_rc_file;
std::string rcfile;
if (getenv ("ARDOUR_SAE")) {
rcfile = "ardour3_ui_default.conf";
}
- if (find_file_in_search_path (ardour_search_path() + system_config_search_path(),
- rcfile, default_ui_rc_file) ) {
+ if (find_file_in_search_path (ardour_config_search_path(), rcfile, default_ui_rc_file) ) {
XMLTree tree;
found = 1;
- string rcfile = default_ui_rc_file.to_string();
+ string rcfile = default_ui_rc_file;
info << string_compose (_("Loading default ui configuration file %1"), rcfile) << endl;
{
bool found = false;
- sys::path default_ui_rc_file;
+ std::string default_ui_rc_file;
- if ( find_file_in_search_path (ardour_search_path() + system_config_search_path(),
- "ardour3_ui_default.conf", default_ui_rc_file) ) {
+ if ( find_file_in_search_path (ardour_config_search_path(), "ardour3_ui_default.conf", default_ui_rc_file)) {
XMLTree tree;
found = true;
- string rcfile = default_ui_rc_file.to_string();
+ string rcfile = default_ui_rc_file;
info << string_compose (_("Loading default ui configuration file %1"), rcfile) << endl;
}
}
- sys::path user_ui_rc_file;
+ std::string user_ui_rc_file;
- if (find_file_in_search_path (ardour_search_path() + user_config_directory(),
- "ardour3_ui.conf", user_ui_rc_file)) {
+ if (find_file_in_search_path (ardour_config_search_path(), "ardour3_ui.conf", user_ui_rc_file)) {
XMLTree tree;
found = true;
- string rcfile = user_ui_rc_file.to_string();
+ string rcfile = user_ui_rc_file;
info << string_compose (_("Loading user ui configuration file %1"), rcfile) << endmsg;
{
XMLTree tree;
- 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 /= "ardour3_ui.conf";
- const string rcfile = rcfile_path.to_string();
+ std::string rcfile(user_config_directory());
+ rcfile = Glib::build_filename (rcfile, "ardour3_ui.conf");
// this test seems bogus?
if (rcfile.length()) {