send control now has working metering, and switches back and forth between busses...

[ardour.git] / gtk2_ardour / ui_config.cc

diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc
index 6ebedaa129583820af32cf7d4ae64076d7f957a6..f52ad14277e62e56139680e2a53a86011a874b44 100644 (file)
--- a/gtk2_ardour/ui_config.cc
+++ b/gtk2_ardour/ui_config.cc
@@ -20,14 +20,16 @@
 #include <unistd.h>
 #include <cstdio> /* for snprintf, grrr */
 
-#include <pbd/failed_constructor.h>
-#include <pbd/xml++.h>
-#include <pbd/filesystem.h>
-#include <pbd/file_utils.h>
-#include <pbd/error.h>
+#include <glibmm/miscutils.h>
 
-#include <ardour/ardour.h>
-#include <ardour/filesystem_paths.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 "ui_config.h"
 
@@ -60,17 +62,24 @@ 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;
+               cerr << 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;
@@ -100,7 +109,7 @@ UIConfiguration::load_state ()
 
                string rcfile = default_ui_rc_file.to_string();
 
-               cerr << string_compose (_("loading default ui configuration file %1"), rcfile) << endl;
+               cerr << 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;
@@ -123,7 +132,7 @@ UIConfiguration::load_state ()
        
                string rcfile = user_ui_rc_file.to_string();
 
-               cerr << string_compose (_("loading user ui configuration file %1"), rcfile) << endl;
+               cerr << 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;
@@ -148,12 +157,10 @@ UIConfiguration::save_state()
 {
        XMLTree tree;
 
-       try
-       {
+       try {
                sys::create_directories (user_config_directory ());
        }
-       catch (const sys::filesystem_error& ex)
-       {
+       catch (const sys::filesystem_error& ex) {
                error << "Could not create user configuration directory" << endmsg;
                return -1;
        }
@@ -230,7 +237,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);
 
                }