#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"
{
}
+int
+UIConfiguration::load_defaults ()
+{
+ int found = 0;
+
+ sys::path 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;
+
+ 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())) {
+ 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(),
- "ardour2_ui_default.conf", default_ui_rc_file) )
+ "ardour3_ui_default.conf", default_ui_rc_file) )
{
XMLTree tree;
found = true;
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;
sys::path user_ui_rc_file;
if (find_file_in_search_path (ardour_search_path() + user_config_directory(),
- "ardour2_ui.conf", user_ui_rc_file))
+ "ardour3_ui.conf", user_ui_rc_file))
{
XMLTree tree;
found = true;
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;
{
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;
}
sys::path rcfile_path(user_config_directory());
- rcfile_path /= "ardour2_ui.conf";
+ rcfile_path /= "ardour3_ui.conf";
const string rcfile = rcfile_path.to_string();
// this test seems bogus?
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);
}
#define CANVAS_VARIABLE(var,name) canvas_colors.push_back(&var);
#include "canvas_vars.h"
#undef CANVAS_VARIABLE
- cerr << "Configuration::pack_canvasvars () called, canvas_colors.size() = " << canvas_colors.size() << endl;
-
}