add variant of Rect::expand() that allows different amounts in each direction

[ardour.git] / gtk2_ardour / main.cc

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 42f94522c2d31dd9435e0e547655bf3f182918c5..a123631a54cc0f2b3219b919e67f2f8767a49e9e 100644 (file)
--- 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'
@@ -74,7 +80,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 +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 */)
 {
@@ -216,9 +244,9 @@ static void command_line_parse_error (int *argc, char** argv[]) {
        // an MSVC app, let the user know we encountered a parsing error.
        Gtk::Main app(argc, argv); // Calls 'gtk_init()'
 
-       Gtk::MessageDialog dlgReportParseError (_("\n   Ardour could not understand your command line      "),
+       Gtk::MessageDialog dlgReportParseError (string_compose (_("\n   %1 could not understand your command line      "), PROGRAM_NAME),
                        false, MESSAGE_ERROR, BUTTONS_CLOSE, true);
-       dlgReportParseError.set_title (_("An error was encountered while launching Ardour"));
+       dlgReportParseError.set_title (string_compose (_("An error was encountered while launching %1"), PROGRAM_NAME));
        dlgReportParseError.run ();
 }
 
@@ -247,13 +275,15 @@ 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
 {
        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 */
 
@@ -261,8 +291,18 @@ 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, "");
+       try {
+               std::locale::global (std::locale (setlocale (LC_ALL, 0)));
+       } catch (...) {
+               std::cerr << "Cannot set C++ locale\n";
+       }
 #endif
 
        console_madness_begin();
@@ -277,7 +317,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.
@@ -320,7 +360,7 @@ int main (int argc, char *argv[])
        }
 
        if (no_splash) {
-               cerr << _("Copyright (C) 1999-2012 Paul Davis") << endl
+               cerr << _("Copyright (C) 1999-2015 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
@@ -330,7 +370,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 +385,26 @@ 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);
+               ui = new ARDOUR_UI (&argc, &argv, localedir.c_str());
        } 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;