fix prev. commit

[ardour.git] / gtk2_ardour / main.cc

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 5cf43700f1d1781800a64911716bbf6febf4d900..441b2dc92956485cb0ab410040dffc51aca45760 100644 (file)
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -74,7 +74,7 @@ TextReceiver text_receiver ("ardour");
 extern int curvetest (string);
 
 static ARDOUR_UI  *ui = 0;
-static const char* localedir = LOCALEDIR;
+static string localedir (LOCALEDIR);
 
 void
 gui_jack_error ()
@@ -99,6 +99,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 */)
 {
@@ -253,7 +275,7 @@ int main (int argc, char *argv[])
 {
        ARDOUR::check_for_old_configuration_files();
 
-       fixup_bundle_environment (argc, argv, &localedir);
+       fixup_bundle_environment (argc, argv, localedir);
 
        load_custom_fonts(); /* needs to happen before any gtk and pango init calls */
 
@@ -277,7 +299,7 @@ int main (int argc, char *argv[])
 #ifdef ENABLE_NLS
        cerr << "bind txt domain [" << PACKAGE << "] to " << localedir << endl;
 
-       (void) bindtextdomain (PACKAGE, localedir);
+       (void) bindtextdomain (PACKAGE, localedir.c_str());
        /* 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.
@@ -330,7 +352,7 @@ int main (int argc, char *argv[])
                     << endl;
        }
 
-       if (!ARDOUR::init (ARDOUR_COMMAND_LINE::use_vst, ARDOUR_COMMAND_LINE::try_hw_optimization, localedir)) {
+       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;
                exit (1);
        }
@@ -345,13 +367,26 @@ int main (int argc, char *argv[])
        }
 #endif
 
+       UIConfiguration* ui_config = new UIConfiguration;
+
+       if (ui_config->pre_gui_init ()) {
+               error << _("Could not complete pre-GUI initialization") << endmsg;
+               exit (1);
+       }
+       
        try {
-               ui = new ARDOUR_UI (&argc, &argv, localedir);
+               ui = new ARDOUR_UI (&argc, &argv, localedir.c_str(), ui_config);
        } catch (failed_constructor& err) {
                error << string_compose (_("could not create %1 GUI"), PROGRAM_NAME) << endmsg;
                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;