removed the following environment variables:

	ARDOUR_GLADE_PATH
	ARDOUR_RC
	ARDOUR_UI
	ARDOUR_UI_RC
	ARDOUR_BINDINGS
	ARDOUR_COLORS

They have been replaced with just one environment
variable called ARDOUR_PATH which can contain a number
of colon separated paths that are used to find various
configuration and data files. Files located in
ARDOUR_PATH have priority over files in ~/.ardour/ and
in the system path.

Moved two member functions of the Configuration class
into globals.cc as they should of been static and I'm
trying to keep the non-portable code together when it
makes sense.


git-svn-id: svn://localhost/trunk/ardour2@380 d708f5d6-7413-0410-9779-e7cbd77b26cf

8 files changed, 23 insertions, 53 deletions

diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc
index 1ca9278baf..137b8b55e5 100644
--- a/gtk2_ardour/actions.cc
+++ b/gtk2_ardour/actions.cc
@@ -64,12 +64,8 @@ ActionManager::init ()
 {
 	ui_manager = UIManager::create ();
 	
-	std::string ui_file = Glib::getenv(X_("ARDOUR_UI"));
-    
-        if(!Glib::file_test(ui_file, Glib::FILE_TEST_EXISTS)) ui_file = ARDOUR::find_config_file("ardour.menus");
+	std::string ui_file = ARDOUR::find_config_file("ardour.menus");
 
-	std::cout << "Loading UI definition file " << ui_file << std::endl;
-	
 	bool loaded = false;
 	
 	try {
diff --git a/gtk2_ardour/ardev_common.sh b/gtk2_ardour/ardev_common.sh
index 2dad81d3ee..9f932e9bbf 100755
--- a/gtk2_ardour/ardev_common.sh
+++ b/gtk2_ardour/ardev_common.sh
@@ -1,8 +1,5 @@
 #export G_DEBUG=fatal_criticals
-export ARDOUR_RC=../ardour.rc
-export ARDOUR_GLADE_PATH=./glade
-export ARDOUR_UI=./ardour.menus
-export ARDOUR_UI_RC=./ardour2_ui.rc
-export ARDOUR_BINDINGS=./ardour.bindings
-export ARDOUR_COLORS=./ardour.colors
+
+export ARDOUR_PATH=./glade:./pixmaps:.:..
+
 export LD_LIBRARY_PATH=../libs/ardour:../libs/midi++2:../libs/pbd3:../libs/soundtouch:../libs/gtkmm2ext:$LD_LIBRARY_PATH
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 72bc9948ee..f99d199681 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -131,11 +131,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], string rcfile)
 	using namespace Gtk::Menu_Helpers;
 
 	Gtkmm2ext::init();
-
-	/* actually, its already loaded, but ... */
-
-	cerr << "Loading UI configuration file " << rcfile << endl;
-
+	
 	about = 0;
 
 	if (theArdourUI == 0) {
@@ -148,12 +144,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], string rcfile)
 
 	color_manager = new ColorManager();
 
-	std::string color_file = Glib::getenv(X_("ARDOUR_COLORS"));
-	if(!Glib::file_test(color_file, Glib::FILE_TEST_EXISTS)) {
-		color_file = ARDOUR::find_config_file("ardour.colors");
-	}
-
-	cerr << "Loading UI color configuration file " << color_file << endl;
+	std::string color_file = ARDOUR::find_config_file("ardour.colors");
 	
 	color_manager->load (color_file);
 
@@ -374,8 +365,8 @@ ARDOUR_UI::save_ardour_state ()
 		session->add_instant_xml(enode, session->path());
 		session->add_instant_xml(mnode, session->path());
 	} else {
-		Config->add_instant_xml(enode, Config->get_user_ardour_path());
-		Config->add_instant_xml(mnode, Config->get_user_ardour_path());
+		Config->add_instant_xml(enode, get_user_ardour_path());
+		Config->add_instant_xml(mnode, get_user_ardour_path());
 	}
 }
 
@@ -2130,7 +2121,7 @@ ARDOUR_UI::mixer_settings () const
 	if (session) {
 		node = session->instant_xml(X_("Mixer"), session->path());
 	} else {
-		node = Config->instant_xml(X_("Mixer"), Config->get_user_ardour_path());
+		node = Config->instant_xml(X_("Mixer"), get_user_ardour_path());
 	}
 
 	if (!node) {
@@ -2148,7 +2139,7 @@ ARDOUR_UI::editor_settings () const
 	if (session) {
 		node = session->instant_xml(X_("Editor"), session->path());
 	} else {
-		node = Config->instant_xml(X_("Editor"), Config->get_user_ardour_path());
+		node = Config->instant_xml(X_("Editor"), get_user_ardour_path());
 	}
 
 	if (!node) {
diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
index dc69ce8483..1f8b0ef702 100644
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -64,12 +64,8 @@ ARDOUR_UI::setup_keybindings ()
 	install_actions ();
 	RedirectBox::register_actions ();
 	
-	std::string key_binding_file = Glib::getenv(X_("ARDOUR_BINDINGS"));
+	std::string key_binding_file = ARDOUR::find_config_file("ardour.bindings");
 
-	if(!Glib::file_test(key_binding_file, Glib::FILE_TEST_EXISTS)) key_binding_file = ARDOUR::find_config_file("ardour.bindings");
-
-	std::cout << "Loading key binding file " << key_binding_file << std::endl;
-	
 	try {
 		AccelMap::load (key_binding_file);
 	} catch (...) {
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 8789632c3b..1012b67211 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -877,7 +877,7 @@ Editor::instant_save ()
 	if (session) {
 		session->add_instant_xml(get_state(), session->path());
 	} else {
-		Config->add_instant_xml(get_state(), Config->get_user_ardour_path());
+		Config->add_instant_xml(get_state(), get_user_ardour_path());
 	}
 }
 
diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 7ec47fe532..8ad1ff6ae0 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -727,8 +727,9 @@ Editor::button_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemTyp
 			break;
 		default:
 			
-			if (Keyboard::modifier_state_contains (event->button.state, Keyboard::ModifierMask(Keyboard::Alt))) {
+			if (Keyboard::modifier_state_equals (event->button.state, Keyboard::ModifierMask(Keyboard::Shift))) {
 				scroll_backward (0.6f);
+				return true;
 			}
 			else if (Keyboard::no_modifier_keys_pressed (&event->button)) {
 				scroll_tracks_up_line ();
@@ -763,8 +764,9 @@ Editor::button_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemTyp
 			break;
 		default:
 
-			if (Keyboard::modifier_state_contains (event->button.state, Keyboard::ModifierMask(Keyboard::Alt))) {
+			if (Keyboard::modifier_state_equals (event->button.state, Keyboard::ModifierMask(Keyboard::Shift))) {
 				scroll_forward (0.6f);
+				return true;
 			}
 			else if (Keyboard::no_modifier_keys_pressed (&event->button)) {
 				scroll_tracks_down_line ();
diff --git a/gtk2_ardour/glade_path.cc b/gtk2_ardour/glade_path.cc
index 3d6476d821..29bca7151f 100644
--- a/gtk2_ardour/glade_path.cc
+++ b/gtk2_ardour/glade_path.cc
@@ -31,15 +31,8 @@
 std::string
 GladePath::path(const std::string& glade_file)
 {
-    std::string user_glade_dir = Glib::getenv(X_("ARDOUR_GLADE_PATH"));
     std::string full_path;
-    
-    if(!user_glade_dir.empty()) {
-        full_path = Glib::build_filename(user_glade_dir, glade_file);
-        if(Glib::file_test(full_path, Glib::FILE_TEST_EXISTS)) return full_path;
-    }
-
-    full_path = ARDOUR::find_data_file(Glib::build_filename("glade",
-                                                            glade_file));
+   
+    full_path = ARDOUR::find_data_file(glade_file, "glade");
     return full_path;
 }
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 3dd0da9250..14330e2009 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -239,18 +239,13 @@ string
 which_ui_rcfile ()
 {
 	string rcfile;
-	char* envvar;
-
-	if ((envvar = getenv("ARDOUR_UI_RC")) == 0) {
-		rcfile = find_config_file ("ardour2_ui.rc");
 	
-		if (rcfile.length() == 0) {
-			warning << _("Without a UI style file, ardour will look strange.\n Please set ARDOUR_UI_RC to point to a valid UI style file") << endmsg;
-		}
-	} else {
-		rcfile = envvar;
-	}
+	rcfile = find_config_file ("ardour2_ui.rc");
 	
+	if (rcfile.length() == 0) {
+		warning << _("Without a UI style file, ardour will look strange.\n Please set ARDOUR_UI_RC to point to a valid UI style file") << endmsg;
+	}
+
 	return rcfile;
 }