From 4ca1fe7993adf63ea3f35958f63dd20ee546e7ae Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sat, 19 Jan 2008 03:49:52 +0000
Subject: Merge with trunk R2935.

git-svn-id: svn://localhost/ardour2/branches/3.0@2943 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/main.cc | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

(limited to 'gtk2_ardour/main.cc')

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index e9c8613224..968ceccb3c 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -62,16 +62,6 @@ extern int curvetest (string);
 static ARDOUR_UI  *ui = 0;
 static const char* localedir = LOCALEDIR;
 
-gint
-show_ui_callback (void *arg)
-{
- 	ARDOUR_UI * ui = (ARDOUR_UI *) arg;
-
-	ui->hide_splash();
-	
-	return FALSE;
-}
-
 void
 gui_jack_error ()
 {
@@ -166,6 +156,16 @@ fixup_bundle_environment ()
 	path += "/../Plugins";
 	
 	setenv ("LADSPA_PATH", path.c_str(), 1);
+	
+	cstr = getenv ("LV2_PATH");
+	if (cstr) {
+		path = cstr;
+		path += ':';
+	}
+	path = dir_path;
+	path += "/../Plugins";
+	
+	setenv ("LV2_PATH", path.c_str(), 1);
 
 	path = dir_path;
 	path += "/../Frameworks/clearlooks";
@@ -363,13 +363,6 @@ int main (int argc, char *argv[])
 		exit (1);
 	}
 
-	if (!no_splash) {
-		ui->show_splash ();
-		if (session_name.length()) {  
-			g_timeout_add (4000, show_ui_callback, ui);
-		}
-	}
-
 	setup_keybindings (ui);
 
 	ui->run (text_receiver);
-- 
cgit v1.2.3