extern int curvetest (string);
static ARDOUR_UI *ui = 0;
-static const char* localedir = LOCALEDIR;
+static string localedir (LOCALEDIR);
void
gui_jack_error ()
} 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()));
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;
DWORD mode;
return (GetConsoleMode(handle, &mode) != 0);
}
+
static void
console_madness_begin ()
{
}
}
-#if defined(NDEBUG) && !defined(RDC_BUILD))
-// Since we don't ordinarily have access to stdout and stderr with
-// an MSVC app, let the user know we encountered a parsing error.
-static void
-command_line_parse_error (int* argc, char** argv[])
-{
- Gtk::Main app(&argc, &argv); // Calls 'gtk_init()'
-
- Gtk::MessageDialog msg (_("\n Ardour could not understand your command line "),
- false, MESSAGE_ERROR, BUTTONS_CLOSE, true);
- msg.set_title (_("An error was encountered while launching Ardour"));
- msg.run ();
-}
-#endif
+static void command_line_parse_error (int *argc, char** argv[]) {}
-#else
+#elif (defined(COMPILER_MSVC) && defined(NDEBUG) && !defined(RDC_BUILD))
+
+// these are not used here. for MSVC see gtk2_ardour/msvc/winmain.cc
static void console_madness_begin () {}
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 ();
+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()'
- return (msg.run() == Gtk::RESPONSE_YES);
+ 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
+static void console_madness_begin () {}
+static void console_madness_end () {}
+static void command_line_parse_error (int *argc, char** argv[]) {}
+#endif
#if (defined(COMPILER_MSVC) && defined(NDEBUG) && !defined(RDC_BUILD))
/*
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 */
#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
#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.
}
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
<< 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);
}
}
#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);
pthread_cancel_all ();
console_madness_end ();
-
+
return 0;
}
#if (defined WINDOWS_VST_SUPPORT && !defined PLATFORM_WINDOWS)
projects / ardour.git / blobdiff