X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fmain.cc;h=d01bca2a624f0cd57dbaa2870d867a369847cb64;hb=17cd6b4044bac5bb348d6a2f12caa2fa81d76327;hp=95858ea055f3074af33dd09bd6ae44850999dee0;hpb=ce7dcfe320e1a842836008ae9de2e9edb7bfb407;p=ardour.git

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 95858ea055..d01bca2a62 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2001-2007 Paul Davis
+    Copyright (C) 2001-2012 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
@@ -21,6 +21,7 @@
 #include <signal.h>
 #include <cerrno>
 #include <fstream>
+#include <vector>
 
 #include <sigc++/bind.h>
 #include <gtkmm/settings.h>
@@ -31,10 +32,11 @@
 #include "pbd/textreceiver.h"
 #include "pbd/failed_constructor.h"
 #include "pbd/pthread_utils.h"
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+#include "pbd/boost_debug.h"
+#endif
 
-#include <jack/jack.h>
-
-#include "ardour/svn_revision.h"
+#include "ardour/revision.h"
 #include "ardour/version.h"
 #include "ardour/ardour.h"
 #include "ardour/audioengine.h"
@@ -46,6 +48,8 @@
 #include <gtkmm2ext/popup.h>
 #include <gtkmm2ext/utils.h>
 
+#include <fontconfig/fontconfig.h>
+
 #include "version.h"
 #include "utils.h"
 #include "ardour_ui.h"
@@ -54,6 +58,10 @@
 
 #include "i18n.h"
 
+#ifdef __APPLE__
+#include <Carbon/Carbon.h>
+#endif
+
 using namespace std;
 using namespace Gtk;
 using namespace ARDOUR_COMMAND_LINE;
@@ -70,17 +78,10 @@ static const char* localedir = LOCALEDIR;
 void
 gui_jack_error ()
 {
-	MessageDialog win (string_compose (_("%1 could not connect to JACK."), PROGRAM_NAME),
-		     false,
-		     Gtk::MESSAGE_INFO,
-		     (Gtk::ButtonsType)(Gtk::BUTTONS_NONE));
-win.set_secondary_text(_("There are several possible reasons:\n\
-\n\
-1) JACK is not running.\n\
-2) JACK is running as another user, perhaps root.\n\
-3) There is already another client called \"ardour\".\n\
-\n\
-Please consider the possibilities, and perhaps (re)start JACK."));
+	MessageDialog win (string_compose (_("%1 could not connect to the audio backend."), PROGRAM_NAME),
+	                   false,
+	                   Gtk::MESSAGE_INFO,
+	                   Gtk::BUTTONS_NONE);
 
 	win.add_button (Stock::QUIT, RESPONSE_CLOSE);
 	win.set_default_response (RESPONSE_CLOSE);
@@ -97,6 +98,22 @@ Please consider the possibilities, and perhaps (re)start JACK."));
 	win.run ();
 }
 
+static void export_search_path (const string& base_dir, const char* varname, const char* dir)
+{
+	string path;
+	const char * cstr = getenv (varname);
+
+	if (cstr) {
+		path = cstr;
+		path += ':';
+	} else {
+		path = "";
+	}
+	path += base_dir;
+	path += dir;
+
+	setenv (varname, path.c_str(), 1);
+}
 
 #ifdef __APPLE__
 
@@ -112,7 +129,7 @@ fixup_bundle_environment (int, char* [])
 		return;
 	}
 
-        EnvironmentalProtectionAgency::set_global_epa (new EnvironmentalProtectionAgency (true, "PREBUNDLE_ENV"));
+	EnvironmentalProtectionAgency::set_global_epa (new EnvironmentalProtectionAgency (true, "PREBUNDLE_ENV"));
 
 	set_language_preference ();
 
@@ -121,120 +138,49 @@ fixup_bundle_environment (int, char* [])
 
 	_NSGetExecutablePath (execpath, &pathsz);
 
-	std::string exec_path (execpath);
-	std::string dir_path = Glib::path_get_dirname (exec_path);
 	std::string path;
-	const char *cstr = getenv ("PATH");
-
-	/* ensure that we find any bundled executables (e.g. JACK),
-	   and find them before any instances of the same name
-	   elsewhere in PATH
-	*/
-
-	path = dir_path;
-
-	/* JACK is often in /usr/local/bin and since Info.plist refuses to 
-	   set PATH, we have to force this in order to discover a running
-	   instance of JACK ...
-	*/
-	
-	path += ':';
-	path += "/usr/local/bin";
-
-	if (cstr) {
-		path += ':';
-		path += cstr;
-	}
-	setenv ("PATH", path.c_str(), 1);
-
-	path = dir_path;
-	path += "/../Resources";
-	path += dir_path;
-	path += "/../Resources/Surfaces";
-	path += dir_path;
-	path += "/../Resources/Panners";
-
-	setenv ("ARDOUR_MODULE_PATH", path.c_str(), 1);
-
-        path = user_config_directory().to_string();
-        path += ':';
-	path += dir_path;
-	path += "/../Resources/icons:";
-	path += dir_path;
-	path += "/../Resources/pixmaps:";
-	path += dir_path;
-	path += "/../Resources/share:";
-	path += dir_path;
-	path += "/../Resources";
-
-	setenv ("ARDOUR_PATH", path.c_str(), 1);
-	setenv ("ARDOUR_CONFIG_PATH", path.c_str(), 1);
-
-	path = dir_path;
-	path += "/../Resources";
-	setenv ("ARDOUR_INSTANT_XML_PATH", path.c_str(), 1);
-
-	cstr = getenv ("LADSPA_PATH");
-	if (cstr) {
-		path = cstr;
-		path += ':';
-	} else {
-		path = "";
-	}
-	path += dir_path;
-	path += "/../Plugins";
-
-	setenv ("LADSPA_PATH", path.c_str(), 1);
-
-	cstr = getenv ("VAMP_PATH");
-	if (cstr) {
-		path = cstr;
-		path += ':';
-	} else {
-		path = "";
-	}
-	path += dir_path;
-	path += "/../Frameworks";
-
-	setenv ("VAMP_PATH", path.c_str(), 1);
+	std::string exec_dir = Glib::path_get_dirname (execpath);
+	std::string bundle_dir;
+	std::string userconfigdir = user_config_directory();
 
-	cstr = getenv ("ARDOUR_CONTROL_SURFACE_PATH");
-	if (cstr) {
-		path = cstr;
-		path += ':';
-	} else {
-		path = "";
-	}
-	path += dir_path;
-	path += "/../Surfaces";
+	bundle_dir = Glib::path_get_dirname (exec_dir);
 
-	setenv ("ARDOUR_CONTROL_SURFACE_PATH", path.c_str(), 1);
-
-	cstr = getenv ("LV2_PATH");
-	if (cstr) {
-		path = cstr;
-		path += ':';
+#ifdef ENABLE_NLS
+	if (!ARDOUR::translations_are_enabled ()) {
+		localedir = "/this/cannot/exist";
 	} else {
-		path = "";
+		/* force localedir into the bundle */
+		
+		vector<string> lpath;
+		lpath.push_back (bundle_dir);
+		lpath.push_back ("Resources");
+		lpath.push_back ("locale");
+		localedir = strdup (Glib::build_filename (lpath).c_str());
 	}
-	path += dir_path;
-	path += "/../Plugins";
+#endif
+		
+	export_search_path (bundle_dir, "ARDOUR_DLL_PATH", "/lib");
 
-	setenv ("LV2_PATH", path.c_str(), 1);
+	/* inside an OS X .app bundle, there is no difference
+	   between DATA and CONFIG locations, since OS X doesn't
+	   attempt to do anything to expose the notion of
+	   machine-independent shared data.
+	*/
 
-	path = dir_path;
-	path += "/../Frameworks/clearlooks";
+	export_search_path (bundle_dir, "ARDOUR_DATA_PATH", "/Resources");
+	export_search_path (bundle_dir, "ARDOUR_CONFIG_PATH", "/Resources");
+	export_search_path (bundle_dir, "ARDOUR_INSTANT_XML_PATH", "/Resources");
+	export_search_path (bundle_dir, "LADSPA_PATH", "/Plugins");
+	export_search_path (bundle_dir, "VAMP_PATH", "/lib");
+	export_search_path (bundle_dir, "GTK_PATH", "/lib/gtkengines");
 
-	setenv ("GTK_PATH", path.c_str(), 1);
+	setenv ("SUIL_MODULE_DIR", (bundle_dir + "/lib").c_str(), 1);
+	setenv ("PATH", (bundle_dir + "/MacOS:" + std::string(getenv ("PATH"))).c_str(), 1);
 
-	if (!ARDOUR::translations_are_disabled ()) {
+	/* unset GTK_RC_FILES so that we only load the RC files that we define
+	 */
 
-		path = dir_path;
-		path += "/../Resources/locale";
-		
-		localedir = strdup (path.c_str());
-		setenv ("GTK_LOCALEDIR", localedir, 1);
-	}
+	unsetenv ("GTK_RC_FILES");
 
 	/* write a pango.rc file and tell pango to use it. we'd love
 	   to put this into the PROGRAM_NAME.app bundle and leave it there,
@@ -244,62 +190,54 @@ fixup_bundle_environment (int, char* [])
 	   actually exists ...
 	*/
 
-	try {
-		sys::create_directories (user_config_directory ());
-	}
-	catch (const sys::filesystem_error& ex) {
-		error << _("Could not create user configuration directory") << endmsg;
-	}
-
-	sys::path pangopath = user_config_directory();
-	pangopath /= "pango.rc";
-	path = pangopath.to_string();
-
-	std::ofstream pangorc (path.c_str());
-	if (!pangorc) {
-		error << string_compose (_("cannot open pango.rc file %1") , path) << endmsg;
-		return;
+	if (g_mkdir_with_parents (userconfigdir.c_str(), 0755) < 0) {
+		error << string_compose (_("cannot create user %3 folder %1 (%2)"), userconfigdir, strerror (errno), PROGRAM_NAME)
+		      << endmsg;
 	} else {
-		pangorc << "[Pango]\nModuleFiles=";
-
-		pangopath = dir_path;
-		pangopath /= "..";
-		pangopath /= "Resources";
-		pangopath /= "pango.modules";
-
-		pangorc << pangopath.to_string() << endl;
-
-		pangorc.close ();
-
-		setenv ("PANGO_RC_FILE", path.c_str(), 1);
+		
+		path = Glib::build_filename (userconfigdir, "pango.rc");
+		std::ofstream pangorc (path.c_str());
+		if (!pangorc) {
+			error << string_compose (_("cannot open pango.rc file %1") , path) << endmsg;
+		} else {
+			pangorc << "[Pango]\nModuleFiles="
+				<< Glib::build_filename (bundle_dir, "Resources/pango.modules") 
+				<< endl;
+			pangorc.close ();
+			
+			setenv ("PANGO_RC_FILE", path.c_str(), 1);
+		}
 	}
+	
+	setenv ("CHARSETALIASDIR", bundle_dir.c_str(), 1);
+	setenv ("FONTCONFIG_FILE", Glib::build_filename (bundle_dir, "Resources/fonts.conf").c_str(), 1);
+	setenv ("GDK_PIXBUF_MODULE_FILE", Glib::build_filename (bundle_dir, "Resources/gdk-pixbuf.loaders").c_str(), 1);
+}
 
-	// gettext charset aliases
-
-	setenv ("CHARSETALIASDIR", path.c_str(), 1);
-
-	// font config
-
-	path = dir_path;
-	path += "/../Resources/fonts.conf";
-
-	setenv ("FONTCONFIG_FILE", path.c_str(), 1);
-
-	// GDK Pixbuf loader module file
-
-	path = dir_path;
-	path += "/../Resources/gdk-pixbuf.loaders";
-
-	setenv ("GDK_PIXBUF_MODULE_FILE", path.c_str(), 1);
-
-	if (getenv ("ARDOUR_WITH_JACK")) {
-		// JACK driver dir
+static void load_custom_fonts() {
+/* this code will only compile on OS X 10.6 and above, and we currently do not
+ * need it for earlier versions since we fall back on a non-monospace,
+ * non-custom font.
+ */
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
+	std::string ardour_mono_file;
 
-		path = dir_path;
-		path += "/../Frameworks";
+	if (!find_file_in_search_path (ardour_data_search_path(), "ArdourMono.ttf", ardour_mono_file)) {
+		cerr << _("Cannot find ArdourMono TrueType font") << endl;
+	}
 
-		setenv ("JACK_DRIVER_DIR", path.c_str(), 1);
+	CFStringRef ttf;
+	CFURLRef fontURL;
+	CFErrorRef error;
+	ttf = CFStringCreateWithBytes(
+			kCFAllocatorDefault, (UInt8*) ardour_mono_file.c_str(),
+			ardour_mono_file.length(),
+			kCFStringEncodingUTF8, FALSE);
+	fontURL = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, ttf, kCFURLPOSIXPathStyle, TRUE);
+	if (CTFontManagerRegisterFontsForURL(fontURL, kCTFontManagerScopeProcess, &error) != true) {
+		cerr << _("Cannot load ArdourMono TrueType font.") << endl;
 	}
+#endif
 }
 
 #else
@@ -307,185 +245,148 @@ fixup_bundle_environment (int, char* [])
 void
 fixup_bundle_environment (int /*argc*/, char* argv[])
 {
+	/* THIS IS FOR LINUX - its just about the only place where its
+	 * acceptable to build paths directly using '/'.
+	 */
+
 	if (!getenv ("ARDOUR_BUNDLED")) {
 		return;
 	}
-	
-        EnvironmentalProtectionAgency::set_global_epa (new EnvironmentalProtectionAgency (true, "PREBUNDLE_ENV"));
-
-	Glib::ustring exec_path = argv[0];
-	Glib::ustring dir_path = Glib::path_get_dirname (Glib::path_get_dirname (exec_path));
-	Glib::ustring path;
-	const char *cstr = getenv ("PATH");
-        Glib::ustring userconfigdir = user_config_directory().to_string();
 
-	/* ensure that we find any bundled executables (e.g. JACK),
-	   and find them before any instances of the same name
-	   elsewhere in PATH
-	*/
+	EnvironmentalProtectionAgency::set_global_epa (new EnvironmentalProtectionAgency (true, "PREBUNDLE_ENV"));
 
-        /* note that this function is POSIX/Linux specific, so using / as 
-           a dir separator in this context is just fine.
-        */
+	std::string path;
+	std::string dir_path = Glib::path_get_dirname (Glib::path_get_dirname (argv[0]));
+	std::string userconfigdir = user_config_directory();
 
-	path = dir_path;
-	path += "/etc:";
-	path += dir_path;
-	path += "/lib/surfaces:";
-	path += dir_path;
-	path += "/lib/panners:";
-
-	setenv ("ARDOUR_MODULE_PATH", path.c_str(), 1);
-
-        path = userconfigdir;
-        path += ':';
-	path += dir_path;
-	path += "/etc/icons:";
-	path += dir_path;
-	path += "/etc/pixmaps:";
-	path += dir_path;
-	path += "/share:";
-	path += dir_path;
-	path += "/etc";
-
-	setenv ("ARDOUR_PATH", path.c_str(), 1);
-	setenv ("ARDOUR_CONFIG_PATH", path.c_str(), 1);
-
-	path = dir_path;
-	path += "/etc";
-	setenv ("ARDOUR_INSTANT_XML_PATH", path.c_str(), 1);
-
-	cstr = getenv ("LADSPA_PATH");
-	if (cstr) {
-		path = cstr;
-		path += ':';
+#ifdef ENABLE_NLS
+	if (!ARDOUR::translations_are_enabled ()) {
+		localedir = "/this/cannot/exist";
 	} else {
-		path = "";
+		/* force localedir into the bundle */
+		vector<string> lpath;
+		lpath.push_back (dir_path);
+		lpath.push_back ("share");
+		lpath.push_back ("locale");
+		localedir = realpath (Glib::build_filename (lpath).c_str(), NULL);
 	}
-	path += dir_path;
-	path += "/lib/plugins";
-	
-	setenv ("LADSPA_PATH", path.c_str(), 1);
+#endif
 
-	cstr = getenv ("VAMP_PATH");
-	if (cstr) {
-		path = cstr;
-		path += ':';
-	} else {
-		path = "";
-	}
-	path += dir_path;
-	path += "/lib";
-	
-	setenv ("VAMP_PATH", path.c_str(), 1);
+	/* note that this function is POSIX/Linux specific, so using / as
+	   a dir separator in this context is just fine.
+	*/
 
-	cstr = getenv ("ARDOUR_CONTROL_SURFACE_PATH");
-	if (cstr) {
-		path = cstr;
-		path += ':';
-	} else {
-		path = "";
-	}
-	path += dir_path;
-	path += "/lib/surfaces";
-	
-	setenv ("ARDOUR_CONTROL_SURFACE_PATH", path.c_str(), 1);
+	export_search_path (dir_path, "ARDOUR_DLL_PATH", "/lib");
+	export_search_path (dir_path, "ARDOUR_CONFIG_PATH", "/etc");
+	export_search_path (dir_path, "ARDOUR_INSTANT_XML_PATH", "/share");
+	export_search_path (dir_path, "ARDOUR_DATA_PATH", "/share");
+	export_search_path (dir_path, "LADSPA_PATH", "/plugins");
+	export_search_path (dir_path, "VAMP_PATH", "/lib");
+	export_search_path (dir_path, "GTK_PATH", "/lib/gtkengines");
 
-	cstr = getenv ("LV2_PATH");
-	if (cstr) {
-		path = cstr;
-		path += ':';
-	} else {
-		path = "";
-	}
-	path += dir_path;
-	path += "/lib/plugins";
-	
-	setenv ("LV2_PATH", path.c_str(), 1);
+	setenv ("SUIL_MODULE_DIR", (dir_path + "/lib").c_str(), 1);
+	setenv ("PATH", (dir_path + "/bin:" + std::string(getenv ("PATH"))).c_str(), 1);
+
+	/* unset GTK_RC_FILES so that we only load the RC files that we define
+	 */
 
-	path = dir_path;
-	path += "/lib/clearlooks";
+	unsetenv ("GTK_RC_FILES");
 
-	setenv ("GTK_PATH", path.c_str(), 1);
+	/* Tell fontconfig where to find fonts.conf. Use the system version
+	   if it exists, otherwise use the stuff we included in the bundle
+	*/
 
-	if (!ARDOUR::translations_are_disabled ()) {
-                path = dir_path;
-                path += "/share/locale";
-                
-                localedir = strdup (path.c_str());
-                setenv ("GTK_LOCALEDIR", localedir, 1);
-        }
+	if (Glib::file_test ("/etc/fonts/fonts.conf", Glib::FILE_TEST_EXISTS)) {
+		setenv ("FONTCONFIG_FILE", "/etc/fonts/fonts.conf", 1);
+		setenv ("FONTCONFIG_PATH", "/etc/fonts", 1);
+	} else {
+		error << _("No fontconfig file found on your system. Things may looked very odd or ugly") << endmsg;
+	}
 
 	/* write a pango.rc file and tell pango to use it. we'd love
 	   to put this into the Ardour.app bundle and leave it there,
-	   but the user may not have write permission. so ... 
+	   but the user may not have write permission. so ...
 
 	   we also have to make sure that the user ardour directory
 	   actually exists ...
 	*/
 
 	if (g_mkdir_with_parents (userconfigdir.c_str(), 0755) < 0) {
-		error << string_compose (_("cannot create user ardour folder %1 (%2)"), userconfigdir, strerror (errno))
+		error << string_compose (_("cannot create user %3 folder %1 (%2)"), userconfigdir, strerror (errno), PROGRAM_NAME)
 		      << endmsg;
 	} else {
-
-                Glib::ustring mpath;
-
+		
 		path = Glib::build_filename (userconfigdir, "pango.rc");
-
 		std::ofstream pangorc (path.c_str());
 		if (!pangorc) {
 			error << string_compose (_("cannot open pango.rc file %1") , path) << endmsg;
-                } else {
-                        mpath = Glib::build_filename (userconfigdir, "pango.modules");
-                        
-			pangorc << "[Pango]\nModuleFiles=";
-			pangorc << mpath << endl;
+		} else {
+			pangorc << "[Pango]\nModuleFiles="
+				<< Glib::build_filename (userconfigdir, "pango.modules")
+				<< endl;
 			pangorc.close ();
-                }
+		}
+		
+		setenv ("PANGO_RC_FILE", path.c_str(), 1);
+		
+		/* similar for GDK pixbuf loaders, but there's no RC file required
+		   to specify where it lives.
+		*/
+		
+		setenv ("GDK_PIXBUF_MODULE_FILE", Glib::build_filename (userconfigdir, "gdk-pixbuf.loaders").c_str(), 1);
+	}
+
+        /* this doesn't do much but setting it should prevent various parts of the GTK/GNU stack
+           from looking outside the bundle to find the charset.alias file.
+        */
+        setenv ("CHARSETALIASDIR", dir_path.c_str(), 1);
 
-                setenv ("PANGO_RC_FILE", path.c_str(), 1);
+}
 
-                /* similar for GDK pixbuf loaders, but there's no RC file required
-                   to specify where it lives.
-                */
+static void load_custom_fonts() {
+	std::string ardour_mono_file;
+	if (!find_file_in_search_path (ardour_data_search_path(), "ArdourMono.ttf", ardour_mono_file)) {
+		cerr << _("Cannot find ArdourMono TrueType font") << endl;
+	}
 
-                mpath = Glib::build_filename (userconfigdir, "gdk-pixbuf.loaders");
-                setenv ("GDK_PIXBUF_MODULE_FILE", mpath.c_str(), 1);
+	FcConfig *config = FcInitLoadConfigAndFonts();
+	FcBool ret = FcConfigAppFontAddFile(config, reinterpret_cast<const FcChar8*>(ardour_mono_file.c_str()));
+	if (ret == FcFalse) {
+		cerr << _("Cannot load ArdourMono TrueType font.") << endl;
+	}
+	ret = FcConfigSetCurrent(config);
+	if (ret == FcFalse) {
+		cerr << _("Failed to set fontconfig configuration.") << endl;
 	}
 }
 
 #endif
 
 static gboolean
-tell_about_jack_death (void* /* ignored */)
+tell_about_backend_death (void* /* ignored */)
 {
 	if (AudioEngine::instance()->processed_frames() == 0) {
 		/* died during startup */
-		MessageDialog msg (_("JACK exited"), false, Gtk::MESSAGE_INFO, Gtk::BUTTONS_OK);
+		MessageDialog msg (string_compose (_("The audio backend (%1) has failed, or terminated"), AudioEngine::instance()->current_backend_name()), false);
 		msg.set_position (Gtk::WIN_POS_CENTER);
 		msg.set_secondary_text (string_compose (_(
-"JACK exited unexpectedly, and without notifying %1.\n\
+"%2 exited unexpectedly, and without notifying %1.\n\
 \n\
-This could be due to misconfiguration or to an error inside JACK.\n\
+This could be due to misconfiguration or to an error inside %2.\n\
 \n\
-Click OK to exit %1."), PROGRAM_NAME));
-    
+Click OK to exit %1."), PROGRAM_NAME, AudioEngine::instance()->current_backend_name()));
+
 		msg.run ();
 		_exit (0);
-		
+
 	} else {
 
-		/* engine has already run, so this is a mid-session JACK death */
-		
-		MessageDialog* msg = manage (new MessageDialog (_("JACK exited"), false, Gtk::MESSAGE_INFO, Gtk::BUTTONS_NONE));
-		msg->set_secondary_text (string_compose (_(
-"JACK exited unexpectedly, and without notifying %1.\n\
-\n\
-This is probably due to an error inside JACK. You should restart JACK\n\
-and reconnect %1 to it, or exit %1 now. You cannot save your\n\
-session at this time, because we would lose your connection information.\n"), PROGRAM_NAME));
-		msg->present ();
+		/* engine has already run, so this is a mid-session backend death */
+			
+		MessageDialog msg (string_compose (_("The audio backend (%1) has failed, or terminated"), AudioEngine::instance()->current_backend_name()), false);
+		msg.set_secondary_text (string_compose (_("%2 exited unexpectedly, and without notifying %1."),
+							 PROGRAM_NAME, AudioEngine::instance()->current_backend_name()));
+		msg.present ();
 	}
 	return false; /* do not call again */
 }
@@ -493,25 +394,21 @@ session at this time, because we would lose your connection information.\n"), PR
 static void
 sigpipe_handler (int /*signal*/)
 {
-        /* XXX fix this so that we do this again after a reconnect to JACK
-         */
+	/* XXX fix this so that we do this again after a reconnect to the backend
+	 */
 
-        static bool done_the_jack_thing = false;
-	
-	if (!done_the_jack_thing) {
+	static bool done_the_backend_thing = false;
+
+	if (!done_the_backend_thing) {
 		AudioEngine::instance()->died ();
-		g_idle_add (tell_about_jack_death, 0);
-		done_the_jack_thing =  true;
+		g_idle_add (tell_about_backend_death, 0);
+		done_the_backend_thing =  true;
 	}
 }
 
-#ifdef HAVE_LV2
-void close_external_ui_windows();
-#endif
-
-#ifdef VST_SUPPORT
+#ifdef WINDOWS_VST_SUPPORT
 
-extern int gui_init (int* argc, char** argv[]);
+extern int windows_vst_gui_init (int* argc, char** argv[]);
 
 /* this is called from the entry point of a wine-compiled
    executable that is linked against gtk2_ardour built
@@ -525,25 +422,33 @@ int main (int argc, char *argv[])
 {
 	fixup_bundle_environment (argc, argv);
 
-	if (!Glib::thread_supported())
+	load_custom_fonts(); /* needs to happend before any gtk and pango init calls */
+
+	if (!Glib::thread_supported()) {
 		Glib::thread_init();
+	}
 
+#ifdef ENABLE_NLS
 	gtk_set_locale ();
+#endif
 
-#ifdef VST_SUPPORT
+#ifdef WINDOWS_VST_SUPPORT
 	/* this does some magic that is needed to make GTK and Wine's own
 	   X11 client interact properly.
 	*/
-	gui_init (&argc, &argv);
+	windows_vst_gui_init (&argc, &argv);
 #endif
 
+#ifdef ENABLE_NLS
+	cerr << "bnd txt domain [" << PACKAGE << "] to " << localedir << endl;
+
 	(void) bindtextdomain (PACKAGE, localedir);
 	/* our i18n translations are all in UTF-8, so make sure
 	   that even if the user locale doesn't specify UTF-8,
 	   we use that when handling them.
 	*/
 	(void) bind_textdomain_codeset (PACKAGE,"UTF-8");
-	(void) textdomain (PACKAGE);
+#endif
 
 	pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS, 0);
 
@@ -554,18 +459,20 @@ int main (int argc, char *argv[])
 	text_receiver.listen_to (fatal);
 	text_receiver.listen_to (warning);
 
-	if (parse_opts (argc, argv)) {
-		exit (1);
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+	if (getenv ("BOOST_DEBUG")) {
+		boost_debug_shared_ptr_show_live_debugging (true);
 	}
+#endif
 
-	if (curvetest_file) {
-		return curvetest (curvetest_file);
+	if (parse_opts (argc, argv)) {
+		exit (1);
 	}
 
 	cout << PROGRAM_NAME
 	     << VERSIONSTRING
 	     << _(" (built using ")
-	     << svn_revision
+	     << revision
 #ifdef __GNUC__
 	     << _(" and GCC version ") << __VERSION__
 #endif
@@ -577,8 +484,8 @@ int main (int argc, char *argv[])
 	}
 
 	if (no_splash) {
-		cerr << _("Copyright (C) 1999-2010 Paul Davis") << endl
-		     << _("Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel Baker") << endl
+		cerr << _("Copyright (C) 1999-2012 Paul Davis") << endl
+		     << _("Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel Baker, Robin Gareus") << endl
 		     << endl
 		     << string_compose (_("%1 comes with ABSOLUTELY NO WARRANTY"), PROGRAM_NAME) << endl
 		     <<	_("not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.") << endl
@@ -589,32 +496,37 @@ int main (int argc, char *argv[])
 
 	/* some GUI objects need this */
 
-	PBD::ID::init ();
+	if (!ARDOUR::init (ARDOUR_COMMAND_LINE::use_vst, ARDOUR_COMMAND_LINE::try_hw_optimization, localedir)) {
+		error << string_compose (_("could not initialize %1."), PROGRAM_NAME) << endmsg;
+		exit (1);
+	}
+
+	if (curvetest_file) {
+		return curvetest (curvetest_file);
+	}
 
 	if (::signal (SIGPIPE, sigpipe_handler)) {
 		cerr << _("Cannot xinstall SIGPIPE error handler") << endl;
 	}
 
 	try {
-		ui = new ARDOUR_UI (&argc, &argv);
+		ui = new ARDOUR_UI (&argc, &argv, localedir);
 	} catch (failed_constructor& err) {
-		error << _("could not create ARDOUR GUI") << endmsg;
+		error << string_compose (_("could not create %1 GUI"), PROGRAM_NAME) << endmsg;
 		exit (1);
 	}
 
 	ui->run (text_receiver);
-        Gtkmm2ext::Application::instance()->cleanup();
+	Gtkmm2ext::Application::instance()->cleanup();
+	delete ui;
 	ui = 0;
 
 	ARDOUR::cleanup ();
 	pthread_cancel_all ();
 
-#ifdef HAVE_LV2
-	close_external_ui_windows();
-#endif
 	return 0;
 }
-#ifdef VST_SUPPORT
+#ifdef WINDOWS_VST_SUPPORT
 } // end of extern C block
 #endif