Add browse button to recent session dialogue. Fixes #3357.

[ardour.git] / gtk2_ardour / ui_config.cc

diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc
index 37a0ade3fe120e98d62481b6ebe25447b41f89fa..12e2817fcf8fcdf787b8f28d1a1bb82a1f67b098 100644 (file)
--- a/gtk2_ardour/ui_config.cc
+++ b/gtk2_ardour/ui_config.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 1999-2006 Paul Davis 
+    Copyright (C) 1999-2006 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -22,14 +22,14 @@
 
 #include <glibmm/miscutils.h>
 
-#include <pbd/failed_constructor.h>
-#include <pbd/xml++.h>
-#include <pbd/filesystem.h>
-#include <pbd/file_utils.h>
-#include <pbd/error.h>
+#include "pbd/failed_constructor.h"
+#include "pbd/xml++.h"
+#include "pbd/filesystem.h"
+#include "pbd/file_utils.h"
+#include "pbd/error.h"
 
-#include <ardour/ardour.h>
-#include <ardour/filesystem_paths.h>
+#include "ardour/ardour.h"
+#include "ardour/filesystem_paths.h"
 
 #include "ui_config.h"
 
@@ -62,38 +62,47 @@ int
 UIConfiguration::load_defaults ()
 {
        int found = 0;
+
        sys::path 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) )
+       std::string rcfile;
+
+       if (getenv ("ARDOUR_SAE")) {
+               rcfile = "ardour3_ui_sae.conf";
+       } else {
+               rcfile = "ardour3_ui_default.conf";
+       }
+
+       if (find_file_in_search_path (ardour_search_path() + system_config_search_path(),
+                                     rcfile, default_ui_rc_file) )
        {
                XMLTree tree;
                found = 1;
 
                string rcfile = default_ui_rc_file.to_string();
 
-               cerr << string_compose (_("loading default ui configuration file %1"), rcfile) << endl;
-               
+               info << string_compose (_("Loading default ui configuration file %1"), rcfile) << endl;
+
                if (!tree.read (rcfile.c_str())) {
                        error << string_compose(_("Ardour: cannot read default ui configuration file \"%1\""), rcfile) << endmsg;
                        return -1;
                }
 
-               if (set_state (*tree.root())) {
+               if (set_state (*tree.root(), Stateful::loading_state_version)) {
                        error << string_compose(_("Ardour: default ui configuration file \"%1\" not loaded successfully."), rcfile) << endmsg;
                        return -1;
                }
        }
+               
        return found;
 }
-       
+
 int
 UIConfiguration::load_state ()
 {
        bool found = false;
-       
+
        sys::path 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) )
        {
@@ -102,14 +111,14 @@ UIConfiguration::load_state ()
 
                string rcfile = default_ui_rc_file.to_string();
 
-               cerr << string_compose (_("loading default ui configuration file %1"), rcfile) << endl;
-               
+               info << string_compose (_("Loading default ui configuration file %1"), rcfile) << endl;
+
                if (!tree.read (rcfile.c_str())) {
                        error << string_compose(_("Ardour: cannot read default ui configuration file \"%1\""), rcfile) << endmsg;
                        return -1;
                }
 
-               if (set_state (*tree.root())) {
+               if (set_state (*tree.root(), Stateful::loading_state_version)) {
                        error << string_compose(_("Ardour: default ui configuration file \"%1\" not loaded successfully."), rcfile) << endmsg;
                        return -1;
                }
@@ -122,17 +131,17 @@ UIConfiguration::load_state ()
        {
                XMLTree tree;
                found = true;
-       
+
                string rcfile = user_ui_rc_file.to_string();
 
-               cerr << string_compose (_("loading user ui configuration file %1"), rcfile) << endl;
+               info << string_compose (_("Loading user ui configuration file %1"), rcfile) << endl;
 
                if (!tree.read (rcfile)) {
                        error << string_compose(_("Ardour: cannot read ui configuration file \"%1\""), rcfile) << endmsg;
                        return -1;
                }
 
-               if (set_state (*tree.root())) {
+               if (set_state (*tree.root(), Stateful::loading_state_version)) {
                        error << string_compose(_("Ardour: user ui configuration file \"%1\" not loaded successfully."), rcfile) << endmsg;
                        return -1;
                }
@@ -157,7 +166,7 @@ UIConfiguration::save_state()
                error << "Could not create user configuration directory" << endmsg;
                return -1;
        }
-       
+
        sys::path rcfile_path(user_config_directory());
 
        rcfile_path /= "ardour3_ui.conf";
@@ -182,14 +191,14 @@ UIConfiguration::get_state ()
        LocaleGuard lg (X_("POSIX"));
 
        root = new XMLNode("Ardour");
-       
+
        root->add_child_nocopy (get_variables ("UI"));
        root->add_child_nocopy (get_variables ("Canvas"));
-       
+
        if (_extra_xml) {
                root->add_child_copy (*_extra_xml);
        }
-       
+
        return *root;
 }
 
@@ -214,7 +223,7 @@ UIConfiguration::get_variables (std::string which_node)
 }
 
 int
-UIConfiguration::set_state (const XMLNode& root)
+UIConfiguration::set_state (const XMLNode& root, int /*version*/)
 {
        if (root.name() != "Ardour") {
                return -1;
@@ -230,7 +239,7 @@ UIConfiguration::set_state (const XMLNode& root)
                if (node->name() == "Canvas" ||  node->name() == "UI") {
                        set_variables (*node);
 
-               } else if (node->name() == "extra") {
+               } else if (node->name() == "Extra") {
                        _extra_xml = new XMLNode (*node);
 
                }
@@ -261,7 +270,7 @@ void
 UIConfiguration::pack_canvasvars ()
 {
 #undef  CANVAS_VARIABLE
-#define CANVAS_VARIABLE(var,name) canvas_colors.push_back(&var); 
+#define CANVAS_VARIABLE(var,name) canvas_colors.push_back(&var);
 #include "canvas_vars.h"
 #undef  CANVAS_VARIABLE
 }