X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmain.cc;h=65ce3538171563984cadf191f43d3d84fc9954c2;hb=b115a04babe8435eeaba36469eeb6145250c70cd;hp=a123631a54cc0f2b3219b919e67f2f8767a49e9e;hpb=93ffece46502e46bf2a22c93ceccc87c0487515f;p=ardour.git

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index a123631a54..65ce353817 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -31,6 +31,8 @@
 #include <fftw3.h>
 #endif
 
+#include <curl/curl.h>
+
 #include "pbd/error.h"
 #include "pbd/file_utils.h"
 #include "pbd/textreceiver.h"
@@ -48,8 +50,9 @@
 #include "ardour/filesystem_paths.h"
 
 #include <gtkmm/main.h>
+#include <gtkmm/stock.h>
+
 #include <gtkmm2ext/application.h>
-#include <gtkmm2ext/popup.h>
 #include <gtkmm2ext/utils.h>
 
 #include "ardour_ui.h"
@@ -69,6 +72,10 @@
 #include "gtk2ardour-version.h"
 #endif
 
+#ifdef LXVST_SUPPORT
+#include <gdk/gdkx.h>
+#endif
+
 using namespace std;
 using namespace Gtk;
 using namespace ARDOUR_COMMAND_LINE;
@@ -283,6 +290,11 @@ int main (int argc, char *argv[])
 {
 	ARDOUR::check_for_old_configuration_files();
 
+	/* global init is not thread safe.*/
+	if (curl_global_init (CURL_GLOBAL_DEFAULT)) {
+		cerr << "curl_global_init() failed. The web is gone. We're all doomed." << endl;
+	}
+
 	fixup_bundle_environment (argc, argv, localedir);
 
 	load_custom_fonts(); /* needs to happen before any gtk and pango init calls */
@@ -291,17 +303,18 @@ int main (int argc, char *argv[])
 		Glib::thread_init();
 	}
 
+#ifdef LXVST_SUPPORT
+	XInitThreads ();
+#endif
+
 #ifdef HAVE_FFTW35F
 	fftwf_make_planner_thread_safe ();
 #endif
 
 #ifdef ENABLE_NLS
-	/* initialize C and C++ locales to user preference */
-	setlocale (LC_ALL, "");
-	try {
-		std::locale::global (std::locale (setlocale (LC_ALL, 0)));
-	} catch (...) {
-		std::cerr << "Cannot set C++ locale\n";
+	/* initialize C locale to user preference */
+	if (ARDOUR::translations_are_enabled ()) {
+		setlocale (LC_ALL, "");
 	}
 #endif
 
@@ -372,6 +385,11 @@ int main (int argc, char *argv[])
 
 	if (!ARDOUR::init (ARDOUR_COMMAND_LINE::use_vst, ARDOUR_COMMAND_LINE::try_hw_optimization, localedir.c_str())) {
 		error << string_compose (_("could not initialize %1."), PROGRAM_NAME) << endmsg;
+		Gtk::Main main (argc, argv);
+		Gtk::MessageDialog msg (string_compose (_("Could not initialize %1 (likely due to corrupt config files).\n"
+		                                          "Run %1 from a commandline for more information."), PROGRAM_NAME),
+		                        false, Gtk::MESSAGE_ERROR , Gtk::BUTTONS_OK, true);
+		msg.run ();
 		exit (1);
 	}
 
@@ -411,8 +429,22 @@ int main (int argc, char *argv[])
 	ui = 0;
 
 	ARDOUR::cleanup ();
+#ifndef NDEBUG
+	if (getenv ("ARDOUR_RUNNING_UNDER_VALGRIND")) {
+		Glib::usleep(100000);
+		sched_yield();
+	}
+#endif
+
 	pthread_cancel_all ();
 
+#ifndef NDEBUG
+	if (getenv ("ARDOUR_RUNNING_UNDER_VALGRIND")) {
+		Glib::usleep(100000);
+		sched_yield();
+	}
+#endif
+
 	console_madness_end ();
 
 	return 0;