X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fui_config.cc;h=12e2817fcf8fcdf787b8f28d1a1bb82a1f67b098;hb=035de2a367acd7ee27c3dbfba2f6c71f3c137eb8;hp=c6dd70c992f53594ba841a23e29bfb3d7bd3e76d;hpb=e0aaed6d65f160c328cb8b56d7c6552ee15d65e2;p=ardour.git

diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc
index c6dd70c992..12e2817fcf 100644
--- 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
@@ -71,36 +71,38 @@ UIConfiguration::load_defaults ()
 	} 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) )
 	{
@@ -109,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;
 		}
@@ -129,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;
 		}
@@ -164,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";
@@ -189,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;
 }
 
@@ -221,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;
@@ -268,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
 }