/*
- 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
} else {
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_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) )
{
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;
}
{
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;
}
error << "Could not create user configuration directory" << endmsg;
return -1;
}
-
+
sys::path rcfile_path(user_config_directory());
rcfile_path /= "ardour3_ui.conf";
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;
}
}
int
-UIConfiguration::set_state (const XMLNode& root)
+UIConfiguration::set_state (const XMLNode& root, int /*version*/)
{
if (root.name() != "Ardour") {
return -1;
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
}