X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmain.cc;h=33e30c2c15876f01644140b4246f4a0f62fde3ae;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=abdfa35877a8e461b925664e20f252b2d408bf74;hpb=ced4378d0914bcfb926267772c45d1d23f3bed38;p=ardour.git

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index abdfa35877..33e30c2c15 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -18,14 +18,19 @@
 */
 
 #include <cstdlib>
-#include <signal.h>
 #include <cerrno>
-#include <fstream>
 #include <vector>
 
+#include <signal.h>
+#include <locale.h>
+
 #include <sigc++/bind.h>
 #include <gtkmm/settings.h>
 
+#ifdef HAVE_FFTW35F
+#include <fftw3.h>
+#endif
+
 #include "pbd/error.h"
 #include "pbd/file_utils.h"
 #include "pbd/textreceiver.h"
@@ -48,11 +53,12 @@
 #include <gtkmm2ext/utils.h>
 
 #include "ardour_ui.h"
+#include "ui_config.h"
 #include "opts.h"
 #include "enums.h"
 #include "bundle_env.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #ifdef PLATFORM_WINDOWS
 #include <fcntl.h> // Needed for '_fmode'
@@ -99,6 +105,28 @@ gui_jack_error ()
 	win.run ();
 }
 
+#ifndef NDEBUG
+static void ardour_g_log (const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer user_data) {
+	switch (log_level) {
+		case G_LOG_FLAG_FATAL:
+		case G_LOG_LEVEL_CRITICAL:
+			fatal << "g_log: " << message << endmsg;
+			break;
+		case G_LOG_LEVEL_ERROR:
+			error << "g_log: " << message << endmsg;
+			break;
+		case G_LOG_LEVEL_WARNING:
+			warning << "g_log: " << message << endmsg;
+			break;
+		case G_LOG_LEVEL_MESSAGE:
+		case G_LOG_LEVEL_INFO:
+		default:
+			info << "g_log: " << message << endmsg;
+			break;
+	}
+}
+#endif
+
 static gboolean
 tell_about_backend_death (void* /* ignored */)
 {
@@ -247,6 +275,8 @@ extern "C" {
 
 int ardour_main (int argc, char *argv[])
 
+#elif defined NOMAIN
+int nomain (int argc, char *argv[])
 #else
 int main (int argc, char *argv[])
 #endif
@@ -261,8 +291,14 @@ int main (int argc, char *argv[])
 		Glib::thread_init();
 	}
 
+#ifdef HAVE_FFTW35F
+	fftwf_make_planner_thread_safe ();
+#endif
+
 #ifdef ENABLE_NLS
-	gtk_set_locale ();
+	/* initialize C and C++ locales to user preference */
+	setlocale (LC_ALL, "");
+	std::locale::global (std::locale (setlocale (LC_ALL, 0)));
 #endif
 
 	console_madness_begin();
@@ -345,6 +381,13 @@ int main (int argc, char *argv[])
 	}
 #endif
 
+	DEBUG_TRACE (DEBUG::Locale, string_compose ("main() locale '%1'\n", setlocale (LC_NUMERIC, NULL)));
+
+	if (UIConfiguration::instance().pre_gui_init ()) {
+		error << _("Could not complete pre-GUI initialization") << endmsg;
+		exit (1);
+	}
+
 	try {
 		ui = new ARDOUR_UI (&argc, &argv, localedir.c_str());
 	} catch (failed_constructor& err) {
@@ -352,6 +395,12 @@ int main (int argc, char *argv[])
 		exit (1);
 	}
 
+#ifndef NDEBUG
+	g_log_set_handler (NULL,
+			GLogLevelFlags (G_LOG_LEVEL_WARNING | G_LOG_FLAG_FATAL |  G_LOG_LEVEL_CRITICAL | G_LOG_FLAG_RECURSION),
+			&ardour_g_log, NULL);
+#endif
+
 	ui->run (text_receiver);
 	Gtkmm2ext::Application::instance()->cleanup();
 	delete ui;