Merge with 2.0-ongoing R3071.

git-svn-id: svn://localhost/ardour2/branches/3.0@3073 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 20 insertions, 59 deletions

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 968ceccb3c..809e654838 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -156,7 +156,27 @@ fixup_bundle_environment ()
 	path += "/../Plugins";
 	
 	setenv ("LADSPA_PATH", path.c_str(), 1);
+
+	cstr = getenv ("VAMP_PATH");
+	if (cstr) {
+		path = cstr;
+		path += ':';
+	}
+	path = dir_path;
+	path += "/../Frameworks";
 	
+	setenv ("VAMP_PATH", path.c_str(), 1);
+
+	cstr = getenv ("ARDOUR_CONTROL_SURFACE_PATH");
+	if (cstr) {
+		path = cstr;
+		path += ':';
+	}
+	path = dir_path;
+	path += "/../Surfaces";
+	
+	setenv ("ARDOUR_CONTROL_SURFACE_PATH", path.c_str(), 1);
+
 	cstr = getenv ("LV2_PATH");
 	if (cstr) {
 		path = cstr;
@@ -225,63 +245,6 @@ fixup_bundle_environment ()
 
 #endif
 
-static void
-setup_keybindings (ARDOUR_UI* ui)
-{
-	Glib::ustring path;
-
-	if (keybindings_path.empty()) {
-		keybindings_path = "ardour";
-	}
-
-	std::string kbpath;
-	
-	if (keybindings_path.find (".bindings") == string::npos) {
-
-		// just a style name - allow user to
-		// specify the layout type. 
-		
-		char* layout;
-		
-		if ((layout = getenv ("ARDOUR_KEYBOARD_LAYOUT")) != 0) {
-			keybindings_path += '-';
-			keybindings_path += layout;
-		}
-
-		keybindings_path += ".bindings";
-	} 
-
-	
-	// XXX timbyr - we need a portable test for "is-absolute" here 
-	
-	if (keybindings_path[0] != '/' && keybindings_path[0] != '.') {
-
-		/* not absolute - look in the usual places */
-		
-		sys::path key_bindings_file;
-
-		find_file_in_search_path (ardour_search_path() + system_config_search_path(),
-				keybindings_path, key_bindings_file);
-
-		path = key_bindings_file.to_string();
-
-		if (path.empty()) {
-			warning << string_compose (_("Key bindings file \"%1\" not found. Default bindings used instead"), 
-					keybindings_path) << endmsg;
-		}
-
-	} else {
-
-		// absolute path from user - use it as is
-
-		path = keybindings_path;
-	}
-
-	if (!path.empty()) {
-		ui->set_keybindings_path (path);
-	}
-}
-
 #ifdef VST_SUPPORT
 /* this is called from the entry point of a wine-compiled
    executable that is linked against gtk2_ardour built
@@ -363,8 +326,6 @@ int main (int argc, char *argv[])
 		exit (1);
 	}
 
-	setup_keybindings (ui);
-
 	ui->run (text_receiver);
 	ui = 0;