X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmain.cc;h=ef35ac64b493811dbc0cdba3059bfe404ae4ffdd;hb=aeed54ed91f5ec34a4a0e973827df301a26790e0;hp=7c46e1d10b3bf52f9fd580a3c02ef5f0beef079e;hpb=3bd3dc04b1cffbea49abf4d16a624bd9cf5b4d20;p=ardour.git diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index 7c46e1d10b..ef35ac64b4 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -18,14 +18,19 @@ */ #include -#include #include -#include #include +#include +#include + #include #include +#ifdef HAVE_FFTW35F +#include +#endif + #include "pbd/error.h" #include "pbd/file_utils.h" #include "pbd/textreceiver.h" @@ -48,6 +53,7 @@ #include #include "ardour_ui.h" +#include "ui_config.h" #include "opts.h" #include "enums.h" #include "bundle_env.h" @@ -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 */) { @@ -119,7 +147,7 @@ Click OK to exit %1."), PROGRAM_NAME, AudioEngine::instance()->current_backend_n } else { /* 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())); @@ -132,8 +160,7 @@ Click OK to exit %1."), PROGRAM_NAME, AudioEngine::instance()->current_backend_n static void sigpipe_handler (int /*signal*/) { - /* XXX fix this so that we do this again after a reconnect to the backend - */ + /* XXX fix this so that we do this again after a reconnect to the backend */ static bool done_the_backend_thing = false; @@ -158,6 +185,7 @@ IsAConsolePort (HANDLE handle) DWORD mode; return (GetConsoleMode(handle, &mode) != 0); } + static void console_madness_begin () { @@ -212,14 +240,14 @@ static void console_madness_begin () {} static void console_madness_end () {} static void command_line_parse_error (int *argc, char** argv[]) { - // Since we don't ordinarily have access to stdout and stderr with - // 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 "), - false, MESSAGE_ERROR, BUTTONS_CLOSE, true); - dlgReportParseError.set_title (_("An error was encountered while launching Ardour")); - dlgReportParseError.run (); + // Since we don't ordinarily have access to stdout and stderr with + // an MSVC app, let the user know we encountered a parsing error. + Gtk::Main app(argc, argv); // Calls 'gtk_init()' + + Gtk::MessageDialog dlgReportParseError (string_compose (_("\n %1 could not understand your command line "), PROGRAM_NAME), + false, MESSAGE_ERROR, BUTTONS_CLOSE, true); + dlgReportParseError.set_title (string_compose (_("An error was encountered while launching %1"), PROGRAM_NAME)); + dlgReportParseError.run (); } #else @@ -228,23 +256,6 @@ static void console_madness_end () {} static void command_line_parse_error (int *argc, char** argv[]) {} #endif -static bool -ask_about_configuration_copy (string const & old_dir, string const & new_dir, int version) -{ - MessageDialog msg (string_compose (_("%1 %2.x has discovered configuration files from %1 %3.x.\n\n" - "Would you like to copy them before starting to use the program?\n\n" - "\n" - "(Note that not all files will be copied, since some are no longer relevant)"), - PROGRAM_NAME, PROGRAM_VERSION, version), true); - - msg.add_button (Gtk::Stock::NO, Gtk::RESPONSE_NO); - msg.add_button (Gtk::Stock::YES, Gtk::RESPONSE_YES); - msg.show_all (); - - return (msg.run() == Gtk::RESPONSE_YES); -} - - #if (defined(COMPILER_MSVC) && defined(NDEBUG) && !defined(RDC_BUILD)) /* * Release build with MSVC uses ardour_main() @@ -264,11 +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 { - fixup_bundle_environment (argc, argv, &localedir); + ARDOUR::check_for_old_configuration_files(); + + fixup_bundle_environment (argc, argv, localedir); load_custom_fonts(); /* needs to happen before any gtk and pango init calls */ @@ -276,12 +291,16 @@ int main (int argc, char *argv[]) Glib::thread_init(); } +#ifdef HAVE_FFTW35F + fftwf_make_planner_thread_safe (); +#endif + #ifdef ENABLE_NLS - gtk_set_locale (); + setlocale (LC_ALL, ""); #endif console_madness_begin(); - + #if (defined WINDOWS_VST_SUPPORT && !defined PLATFORM_WINDOWS) /* this does some magic that is needed to make GTK and X11 client interact properly. * the platform dependent code is in windows_vst_plugin_ui.cc @@ -292,7 +311,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. @@ -335,7 +354,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 @@ -345,7 +364,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); } @@ -360,13 +379,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; @@ -376,7 +408,7 @@ int main (int argc, char *argv[]) pthread_cancel_all (); console_madness_end (); - + return 0; } #if (defined WINDOWS_VST_SUPPORT && !defined PLATFORM_WINDOWS)