add session save signal and hook-up videotimeline

[ardour.git] / gtk2_ardour / ui_config.cc

diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc
index 0d41ade0a591be3fffcb06bb90b6986113845105..86f03bbd95ad5c4c9ab755c394bddc78f962f17f 100644 (file)
--- a/gtk2_ardour/ui_config.cc
+++ b/gtk2_ardour/ui_config.cc
@@ -25,13 +25,11 @@
 
 #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"
@@ -66,7 +64,7 @@ UIConfiguration::load_defaults ()
 {
        int found = 0;
 
-       sys::path default_ui_rc_file;
+       std::string default_ui_rc_file;
        std::string rcfile;
 
        if (getenv ("ARDOUR_SAE")) {
@@ -79,7 +77,7 @@ UIConfiguration::load_defaults ()
                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;
 
@@ -104,13 +102,13 @@ UIConfiguration::load_state ()
 {
        bool found = false;
 
-       sys::path default_ui_rc_file;
+       std::string 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;
 
@@ -125,13 +123,13 @@ UIConfiguration::load_state ()
                }
        }
 
-       sys::path user_ui_rc_file;
+       std::string 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;
 
@@ -161,18 +159,8 @@ UIConfiguration::save_state()
 {
        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()) {