X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmain.cc;h=a35cd1f3e7735a00ed3c10338319e14761b2a047;hb=7b155267505af3fedffc7972b08cb784c97b7e74;hp=047bb130a4b218771cdb0ed9522b5c21a573b8a0;hpb=79986643c0c904f6574bb5323e2233a43a9e622e;p=ardour.git diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index 047bb130a4..a35cd1f3e7 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -1,6 +1,6 @@ /* - Copyright (C) 2001-2006 Paul Davis - + Copyright (C) 2001-2007 Paul Davis + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -15,348 +15,517 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ -#include -#include -#include -#include #include #include -#include +#include +#include #include #include -#include -#include -#include -#include +#include "pbd/error.h" +#include "pbd/epa.h" +#include "pbd/file_utils.h" +#include "pbd/textreceiver.h" +#include "pbd/failed_constructor.h" +#include "pbd/pthread_utils.h" +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS +#include "pbd/boost_debug.h" +#endif #include -#include -#include -#include +#include "ardour/svn_revision.h" +#include "ardour/version.h" +#include "ardour/ardour.h" +#include "ardour/audioengine.h" +#include "ardour/session_utils.h" +#include "ardour/filesystem_paths.h" #include +#include #include #include #include "version.h" +#include "utils.h" #include "ardour_ui.h" #include "opts.h" +#include "enums.h" #include "i18n.h" +using namespace std; using namespace Gtk; -using namespace GTK_ARDOUR; +using namespace ARDOUR_COMMAND_LINE; using namespace ARDOUR; using namespace PBD; -using namespace sigc; TextReceiver text_receiver ("ardour"); extern int curvetest (string); static ARDOUR_UI *ui = 0; +static const char* localedir = LOCALEDIR; -static void -shutdown (int status) +void +gui_jack_error () { - char* msg; - - if (status) { + MessageDialog win (string_compose (_("%1 could not connect to JACK."), PROGRAM_NAME), + false, + Gtk::MESSAGE_INFO, + (Gtk::ButtonsType)(Gtk::BUTTONS_NONE)); +win.set_secondary_text(_("There are several possible reasons:\n\ +\n\ +1) JACK is not running.\n\ +2) JACK is running as another user, perhaps root.\n\ +3) There is already another client called \"ardour\".\n\ +\n\ +Please consider the possibilities, and perhaps (re)start JACK.")); - msg = _("ardour is killing itself for a clean exit\n"); - write (1, msg, strlen (msg)); - /* drastic, but perhaps necessary */ - kill (-getpgrp(), SIGKILL); - /*NOTREACHED*/ + win.add_button (Stock::QUIT, RESPONSE_CLOSE); + win.set_default_response (RESPONSE_CLOSE); - } else { + win.show_all (); + win.set_position (Gtk::WIN_POS_CENTER); - if (ui) { - msg = _("stopping user interface\n"); - write (1, msg, strlen (msg)); - ui->kill(); - } - - pthread_cancel_all (); + if (!no_splash) { + ui->hide_splash (); } - exit (status); + /* we just don't care about the result, but we want to block */ + + win.run (); } -static void -handler (int sig) -{ - char buf[64]; - int n; +#ifdef __APPLE__ - /* XXX its doubtful that snprintf() is async-safe */ - n = snprintf (buf, sizeof(buf), _("%d(%d): received signal %d\n"), getpid(), (int) pthread_self(), sig); - write (1, buf, n); +#include +#include - shutdown (1); -} +extern void set_language_preference (); // cocoacarbon.mm -static void * -signal_thread (void *arg) +void +fixup_bundle_environment (int, char* []) { - int sig; - sigset_t blocked; + if (!getenv ("ARDOUR_BUNDLED")) { + return; + } - PBD::ThreadCreated (pthread_self(), X_("Signal")); + EnvironmentalProtectionAgency::set_global_epa (new EnvironmentalProtectionAgency (true, "PREBUNDLE_ENV")); - pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS, 0); - - /* find out what's blocked right now */ + set_language_preference (); - //sigprocmask (SIG_SETMASK, 0, &blocked); - if (pthread_sigmask (SIG_SETMASK, 0, &blocked)) { - cerr << "getting blocked signals failed\n"; - } - - /* wait for any of the currently blocked signals. - - According to the man page found in linux 2.6 and 2.4, sigwait() - never returns an error. This is incorrect. Checking the man - pages for some other *nix systems makes it clear that - sigwait() can return several error codes, one of which - is EINTR. This happens if the thread receives a signal - which is not in the blocked set. - - We do not expect that to happen, and if it did we should generally - exit as planned. However, under 2.6, the ptrace facility used - by gdb seems to also cause sigwait() to return with EINTR - but with a signal that sigwait cannot understand. As a result, - "sig" is set to zero, an impossible signal number. - - Handling the EINTR code makes it possible to debug - ardour on a 2.6 kernel. + char execpath[MAXPATHLEN+1]; + uint32_t pathsz = sizeof (execpath); + + _NSGetExecutablePath (execpath, &pathsz); + std::string exec_path (execpath); + std::string dir_path = Glib::path_get_dirname (exec_path); + std::string path; + const char *cstr = getenv ("PATH"); + + /* ensure that we find any bundled executables (e.g. JACK), + and find them before any instances of the same name + elsewhere in PATH */ - int swerr; + path = dir_path; - again: - if ((swerr = sigwait (&blocked, &sig))) { - if (swerr == EINTR) { - goto again; - } else { - cerr << "sigwait failed with " << swerr << endl; - } + /* JACK is often in /usr/local/bin and since Info.plist refuses to + set PATH, we have to force this in order to discover a running + instance of JACK ... + */ + + path += ':'; + path += "/usr/local/bin"; + + if (cstr) { + path += ':'; + path += cstr; + } + setenv ("PATH", path.c_str(), 1); + + path = dir_path; + path += "/../Resources"; + path += dir_path; + path += "/../Resources/Surfaces"; + path += dir_path; + path += "/../Resources/Panners"; + + setenv ("ARDOUR_MODULE_PATH", path.c_str(), 1); + + path = user_config_directory().to_string(); + path += ':'; + path += dir_path; + path += "/../Resources/icons:"; + path += dir_path; + path += "/../Resources/pixmaps:"; + path += dir_path; + path += "/../Resources/share:"; + path += dir_path; + path += "/../Resources"; + + setenv ("ARDOUR_PATH", path.c_str(), 1); + setenv ("ARDOUR_CONFIG_PATH", path.c_str(), 1); + + path = dir_path; + path += "/../Resources"; + setenv ("ARDOUR_INSTANT_XML_PATH", path.c_str(), 1); + + cstr = getenv ("LADSPA_PATH"); + if (cstr) { + path = cstr; + path += ':'; + } else { + path = ""; } + path += dir_path; + path += "/../Plugins"; - cerr << "Signal " << sig << " received\n"; + setenv ("LADSPA_PATH", path.c_str(), 1); - if (sig != SIGSEGV) { + cstr = getenv ("VAMP_PATH"); + if (cstr) { + path = cstr; + path += ':'; + } else { + path = ""; + } + path += dir_path; + path += "/../Frameworks"; - /* unblock signals so we can see them during shutdown. - this will help prod developers not to lose sight - of bugs that cause segfaults etc. during shutdown. - */ + setenv ("VAMP_PATH", path.c_str(), 1); - sigprocmask (SIG_UNBLOCK, &blocked, 0); + cstr = getenv ("ARDOUR_CONTROL_SURFACE_PATH"); + if (cstr) { + path = cstr; + path += ':'; + } else { + path = ""; } + path += dir_path; + path += "/../Surfaces"; - shutdown (1); - /*NOTREACHED*/ - return 0; -} + setenv ("ARDOUR_CONTROL_SURFACE_PATH", path.c_str(), 1); -int -catch_signals (void) -{ - struct sigaction action; - pthread_t signal_thread_id; - sigset_t signals; - -// if (setpgid (0,0)) { - if (setsid ()) { - warning << string_compose (_("cannot become new process group leader (%1)"), - strerror (errno)) - << endmsg; + cstr = getenv ("ARDOUR_PANNER_PATH"); + if (cstr) { + path = cstr; + path += ':'; + } else { + path = ""; } + path += dir_path; + path += "/lib/panners"; + + setenv ("ARDOUR_PANNER_PATH", path.c_str(), 1); - sigemptyset (&signals); - sigaddset(&signals, SIGHUP); - sigaddset(&signals, SIGINT); - sigaddset(&signals, SIGQUIT); - sigaddset(&signals, SIGPIPE); - sigaddset(&signals, SIGTERM); - sigaddset(&signals, SIGUSR1); - sigaddset(&signals, SIGUSR2); + path = dir_path; + path += "/../Frameworks/clearlooks"; + setenv ("GTK_PATH", path.c_str(), 1); - /* install a handler because otherwise - pthreads behaviour is undefined when we enter - sigwait. - */ - - action.sa_handler = handler; - action.sa_mask = signals; - action.sa_flags = SA_RESTART|SA_RESETHAND; - - for (int i = 1; i < 32; i++) { - if (sigismember (&signals, i)) { - if (sigaction (i, &action, 0)) { - cerr << string_compose (_("cannot setup signal handling for %1"), i) << endl; - return -1; - } - } - } - - /* this sets the signal mask for this and all - subsequent threads that do not reset it. - */ - - if (pthread_sigmask (SIG_SETMASK, &signals, 0)) { - cerr << string_compose (_("cannot set default signal mask (%1)"), strerror (errno)) << endl; - return -1; - } + /* unset GTK_RC_FILES so that we only load the RC files that we define + */ - /* start a thread to wait for signals */ + unsetenv ("GTK_RC_FILES"); - if (pthread_create_and_store ("signal", &signal_thread_id, 0, signal_thread, 0)) { - cerr << "cannot create signal catching thread" << endl; - return -1; + if (!ARDOUR::translations_are_disabled ()) { + + path = dir_path; + path += "/../Resources/locale"; + + localedir = strdup (path.c_str()); + setenv ("GTK_LOCALEDIR", localedir, 1); } - pthread_detach (signal_thread_id); - return 0; -} + /* write a pango.rc file and tell pango to use it. we'd love + to put this into the PROGRAM_NAME.app bundle and leave it there, + but the user may not have write permission. so ... -string -which_ui_rcfile () -{ - string rcfile; - char* env; + we also have to make sure that the user ardour directory + actually exists ... + */ - if ((env = getenv ("ARDOUR2_UI_RC")) != 0 && strlen (env)) { - rcfile = env; - } else { - rcfile = "ardour2_ui.rc"; + try { + sys::create_directories (user_config_directory ()); + } + catch (const sys::filesystem_error& ex) { + error << _("Could not create user configuration directory") << endmsg; } - rcfile = find_config_file (rcfile); - - if (rcfile.empty()) { - warning << _("Without a UI style file, ardour will look strange.\n Please set ARDOUR2_UI_RC to point to a valid UI style file") << endmsg; + sys::path pangopath = user_config_directory(); + pangopath /= "pango.rc"; + path = pangopath.to_string(); + + std::ofstream pangorc (path.c_str()); + if (!pangorc) { + error << string_compose (_("cannot open pango.rc file %1") , path) << endmsg; + return; } else { - cerr << "Loading ui configuration file " << rcfile << endl; + pangorc << "[Pango]\nModuleFiles="; + + pangopath = dir_path; + pangopath /= ".."; + pangopath /= "Resources"; + pangopath /= "pango.modules"; + + pangorc << pangopath.to_string() << endl; + + pangorc.close (); + + setenv ("PANGO_RC_FILE", path.c_str(), 1); } - - return rcfile; -} -gint -show_ui_callback (void *arg) -{ - ARDOUR_UI * ui = (ARDOUR_UI *) arg; + // gettext charset aliases - ui->hide_splash(); - ui->show (); - - return FALSE; + setenv ("CHARSETALIASDIR", path.c_str(), 1); + + // font config + + path = dir_path; + path += "/../Resources/fonts.conf"; + + setenv ("FONTCONFIG_FILE", path.c_str(), 1); + + // GDK Pixbuf loader module file + + path = dir_path; + path += "/../Resources/gdk-pixbuf.loaders"; + + setenv ("GDK_PIXBUF_MODULE_FILE", path.c_str(), 1); + + if (getenv ("ARDOUR_WITH_JACK")) { + // JACK driver dir + + path = dir_path; + path += "/../Frameworks"; + + setenv ("JACK_DRIVER_DIR", path.c_str(), 1); + } } +#else + void -gui_jack_error () +fixup_bundle_environment (int /*argc*/, char* argv[]) { - MessageDialog win (_("Ardour could not connect to JACK."), - false, - Gtk::MESSAGE_INFO, - (Gtk::ButtonsType)(Gtk::BUTTONS_NONE)); -win.set_secondary_text(_("There are several possible reasons:\n\ -\n\ -1) JACK is not running.\n\ -2) JACK is running as another user, perhaps root.\n\ -3) There is already another client called \"ardour\".\n\ -\n\ -Please consider the possibilities, and perhaps (re)start JACK.")); + if (!getenv ("ARDOUR_BUNDLED")) { + return; + } + + EnvironmentalProtectionAgency::set_global_epa (new EnvironmentalProtectionAgency (true, "PREBUNDLE_ENV")); - win.add_button (Stock::QUIT, RESPONSE_CLOSE); - win.set_default_response (RESPONSE_CLOSE); + Glib::ustring exec_path = argv[0]; + Glib::ustring dir_path = Glib::path_get_dirname (Glib::path_get_dirname (exec_path)); + Glib::ustring path; + const char *cstr = getenv ("PATH"); + Glib::ustring userconfigdir = user_config_directory().to_string(); + + /* ensure that we find any bundled executables (e.g. JACK), + and find them before any instances of the same name + elsewhere in PATH + */ + + /* note that this function is POSIX/Linux specific, so using / as + a dir separator in this context is just fine. + */ + + path = dir_path; + path += "/etc:"; + path += dir_path; + path += "/lib/surfaces:"; + path += dir_path; + path += "/lib/panners:"; + + setenv ("ARDOUR_MODULE_PATH", path.c_str(), 1); + + path = userconfigdir; + path += ':'; + path += dir_path; + path += "/etc/icons:"; + path += dir_path; + path += "/etc/pixmaps:"; + path += dir_path; + path += "/share:"; + path += dir_path; + path += "/etc"; + + setenv ("ARDOUR_PATH", path.c_str(), 1); + setenv ("ARDOUR_CONFIG_PATH", path.c_str(), 1); + + path = dir_path; + path += "/etc"; + setenv ("ARDOUR_INSTANT_XML_PATH", path.c_str(), 1); + + cstr = getenv ("LADSPA_PATH"); + if (cstr) { + path = cstr; + path += ':'; + } else { + path = ""; + } + path += dir_path; + path += "/lib/plugins"; - win.show_all (); - win.set_position (Gtk::WIN_POS_CENTER); + setenv ("LADSPA_PATH", path.c_str(), 1); - /* we just don't care about the result */ + cstr = getenv ("VAMP_PATH"); + if (cstr) { + path = cstr; + path += ':'; + } else { + path = ""; + } + path += dir_path; + path += "/lib"; + + setenv ("VAMP_PATH", path.c_str(), 1); - win.run (); -} + cstr = getenv ("ARDOUR_CONTROL_SURFACE_PATH"); + if (cstr) { + path = cstr; + path += ':'; + } else { + path = ""; + } + path += dir_path; + path += "/lib/surfaces"; + + setenv ("ARDOUR_CONTROL_SURFACE_PATH", path.c_str(), 1); -static bool -maybe_load_session () -{ + cstr = getenv ("ARDOUR_PANNER_PATH"); + if (cstr) { + path = cstr; + path += ':'; + } else { + path = ""; + } + path += dir_path; + path += "/lib/panners"; + + setenv ("ARDOUR_PANNER_PATH", path.c_str(), 1); - /* load session, if given */ - string name, path; + path = dir_path; + path += "/lib/clearlooks"; - if (session_name.length()){ - bool isnew; + setenv ("GTK_PATH", path.c_str(), 1); - if (Session::find_session (session_name, path, name, isnew)) { - error << string_compose(_("could not load command line session \"%1\""), session_name) << endmsg; - } else { + /* unset GTK_RC_FILES so that we only load the RC files that we define + */ - if (new_session) { + unsetenv ("GTK_RC_FILES"); - /* command line required that the session be new */ + if (!ARDOUR::translations_are_disabled ()) { + path = dir_path; + path += "/share/locale"; + + localedir = strdup (path.c_str()); + setenv ("GTK_LOCALEDIR", localedir, 1); + } - if (isnew) { - - /* popup the new session dialog - once everything else is OK. - */ + /* write a pango.rc file and tell pango to use it. we'd love + to put this into the Ardour.app bundle and leave it there, + but the user may not have write permission. so ... - Glib::signal_idle().connect (bind (mem_fun (*ui, &ARDOUR_UI::cmdline_new_session), path)); - ui->set_will_create_new_session_automatically (true); + we also have to make sure that the user ardour directory + actually exists ... + */ + + if (g_mkdir_with_parents (userconfigdir.c_str(), 0755) < 0) { + error << string_compose (_("cannot create user ardour folder %1 (%2)"), userconfigdir, strerror (errno)) + << endmsg; + } else { - } else { + Glib::ustring mpath; - /* it wasn't new, but we require a new session */ + path = Glib::build_filename (userconfigdir, "pango.rc"); - error << string_compose (_("\n\nA session named \"%1\" already exists.\n\ -To avoid this message, start ardour as \"ardour %1"), path) - << endmsg; - return false; - } + std::ofstream pangorc (path.c_str()); + if (!pangorc) { + error << string_compose (_("cannot open pango.rc file %1") , path) << endmsg; + } else { + mpath = Glib::build_filename (userconfigdir, "pango.modules"); + + pangorc << "[Pango]\nModuleFiles="; + pangorc << mpath << endl; + pangorc.close (); + } - } else { + setenv ("PANGO_RC_FILE", path.c_str(), 1); - /* command line didn't require a new session */ - - if (isnew) { - error << string_compose (_("\n\nNo session named \"%1\" exists.\n\ -To create it from the command line, start ardour as \"ardour --new %1"), path) - << endmsg; - return false; - } + /* similar for GDK pixbuf loaders, but there's no RC file required + to specify where it lives. + */ - ui->load_session (path, name); - } - } + mpath = Glib::build_filename (userconfigdir, "gdk-pixbuf.loaders"); + setenv ("GDK_PIXBUF_MODULE_FILE", mpath.c_str(), 1); + } +} - if (no_splash) { - ui->show(); - } +#endif +static gboolean +tell_about_jack_death (void* /* ignored */) +{ + if (AudioEngine::instance()->processed_frames() == 0) { + /* died during startup */ + MessageDialog msg (_("JACK exited"), false, Gtk::MESSAGE_INFO, Gtk::BUTTONS_OK); + msg.set_position (Gtk::WIN_POS_CENTER); + msg.set_secondary_text (string_compose (_( +"JACK exited unexpectedly, and without notifying %1.\n\ +\n\ +This could be due to misconfiguration or to an error inside JACK.\n\ +\n\ +Click OK to exit %1."), PROGRAM_NAME)); + + msg.run (); + _exit (0); + } else { - ui->hide_splash (); - if (!Config->get_no_new_session_dialog()) { - ui->new_session (true); - } + + /* engine has already run, so this is a mid-session JACK death */ + + MessageDialog* msg = manage (new MessageDialog (_("JACK exited"), false, Gtk::MESSAGE_INFO, Gtk::BUTTONS_NONE)); + msg->set_secondary_text (string_compose (_( +"JACK exited unexpectedly, and without notifying %1.\n\ +\n\ +This is probably due to an error inside JACK. You should restart JACK\n\ +and reconnect %1 to it, or exit %1 now. You cannot save your\n\ +session at this time, because we would lose your connection information.\n"), PROGRAM_NAME)); + msg->present (); } + return false; /* do not call again */ +} + +static void +sigpipe_handler (int /*signal*/) +{ + /* XXX fix this so that we do this again after a reconnect to JACK + */ - return true; + static bool done_the_jack_thing = false; + + if (!done_the_jack_thing) { + AudioEngine::instance()->died (); + g_idle_add (tell_about_jack_death, 0); + done_the_jack_thing = true; + } } +#ifdef HAVE_LV2 +void close_external_ui_windows(); +#endif + #ifdef VST_SUPPORT + +extern int gui_init (int* argc, char** argv[]); + /* this is called from the entry point of a wine-compiled executable that is linked against gtk2_ardour built as a shared library. @@ -366,28 +535,45 @@ int ardour_main (int argc, char *argv[]) #else int main (int argc, char *argv[]) #endif - { - ARDOUR::AudioEngine *engine; - vector null_file_list; + fixup_bundle_environment (argc, argv); + + if (!Glib::thread_supported()) { + Glib::thread_init(); + } - // needs a better home. - Glib::thread_init(); - gtk_set_locale (); - (void) bindtextdomain (PACKAGE, LOCALEDIR); +#ifdef VST_SUPPORT + /* this does some magic that is needed to make GTK and Wine's own + X11 client interact properly. + */ + gui_init (&argc, &argv); +#endif + + (void) bindtextdomain (PACKAGE, localedir); + /* 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. + */ + (void) bind_textdomain_codeset (PACKAGE,"UTF-8"); (void) textdomain (PACKAGE); pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS, 0); - // catch_signals (); + // catch error message system signals (); text_receiver.listen_to (error); text_receiver.listen_to (info); text_receiver.listen_to (fatal); text_receiver.listen_to (warning); +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS + if (getenv ("BOOST_DEBUG")) { + boost_debug_shared_ptr_show_live_debugging (true); + } +#endif + if (parse_opts (argc, argv)) { exit (1); } @@ -395,77 +581,57 @@ int main (int argc, char *argv[]) if (curvetest_file) { return curvetest (curvetest_file); } - - cout << _("Ardour/GTK ") + + cout << PROGRAM_NAME << VERSIONSTRING - << _("\n (built using ") - << gtk_ardour_major_version << '.' - << gtk_ardour_minor_version << '.' - << gtk_ardour_micro_version - << _(" with libardour ") - << libardour_major_version << '.' - << libardour_minor_version << '.' - << libardour_micro_version + << _(" (built using ") + << svn_revision #ifdef __GNUC__ - << _(" and GCC version ") << __VERSION__ + << _(" and GCC version ") << __VERSION__ #endif << ')' << endl; - + if (just_version) { exit (0); } if (no_splash) { - cerr << _("Copyright (C) 1999-2006 Paul Davis") << endl + cerr << _("Copyright (C) 1999-2011 Paul Davis") << endl << _("Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel Baker") << endl << endl - << _("Ardour comes with ABSOLUTELY NO WARRANTY") << endl + << string_compose (_("%1 comes with ABSOLUTELY NO WARRANTY"), PROGRAM_NAME) << endl << _("not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.") << endl << _("This is free software, and you are welcome to redistribute it ") << endl << _("under certain conditions; see the source for copying conditions.") << endl; } - try { - ui = new ARDOUR_UI (&argc, &argv, which_ui_rcfile()); - } - - catch (failed_constructor& err) { - error << _("could not create ARDOUR GUI") << endmsg; - exit (1); - } + /* some GUI objects need this */ + PBD::ID::init (); - if (!no_splash) { - ui->show_splash (); - if (session_name.length()) { - gtk_timeout_add (4000, show_ui_callback, ui); - } + if (::signal (SIGPIPE, sigpipe_handler)) { + cerr << _("Cannot xinstall SIGPIPE error handler") << endl; } - - try { - engine = new ARDOUR::AudioEngine (jack_client_name); - ARDOUR::init (use_vst, try_hw_optimization); - ui->set_engine (*engine); - } catch (AudioEngine::NoBackendAvailable& err) { - gui_jack_error (); - error << string_compose (_("Could not connect to JACK server as \"%1\""), jack_client_name) << endmsg; - return -1; - } catch (failed_constructor& err) { - error << _("could not initialize Ardour.") << endmsg; - return -1; - } - if (maybe_load_session ()) { - ui->run (text_receiver); - ui = 0; + try { + ui = new ARDOUR_UI (&argc, &argv); + } catch (failed_constructor& err) { + error << _("could not create ARDOUR GUI") << endmsg; + exit (1); } - delete engine; + ui->run (text_receiver); + Gtkmm2ext::Application::instance()->cleanup(); + ui = 0; + ARDOUR::cleanup (); - shutdown (0); + pthread_cancel_all (); +#ifdef HAVE_LV2 + close_external_ui_windows(); +#endif return 0; } #ifdef VST_SUPPORT