X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmain.cc;h=0279c4953e562accdae168ddd34397d2c0635e42;hb=8d1775b4582a4fe96b254dd3877377406ee51642;hp=778355c858414b1793c509ef36df39cbbd84b7e0;hpb=2b5d095464a28ae680cf4454af99b4debd3bcabf;p=ardour.git diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index 778355c858..0279c4953e 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -1,5 +1,5 @@ /* - 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 @@ -15,16 +15,9 @@ 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 @@ -44,9 +37,11 @@ #include #include +#include "svn_revision.h" #include "version.h" #include "ardour_ui.h" #include "opts.h" +#include "enums.h" #include "i18n.h" @@ -62,174 +57,6 @@ extern int curvetest (string); static ARDOUR_UI *ui = 0; -static void -shutdown (int status) -{ - char* msg; - - if (status) { - - msg = _("ardour is killing itself for a clean exit\n"); - write (1, msg, strlen (msg)); - /* drastic, but perhaps necessary */ - kill (-getpgrp(), SIGKILL); - /*NOTREACHED*/ - - } else { - - if (ui) { - msg = _("stopping user interface\n"); - write (1, msg, strlen (msg)); - ui->kill(); - } - - pthread_cancel_all (); - } - - exit (status); -} - - -static void -handler (int sig) -{ - char buf[64]; - int n; - - /* 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); - - shutdown (1); -} - -static void * -signal_thread (void *arg) -{ - int sig; - sigset_t blocked; - - PBD::ThreadCreated (pthread_self(), X_("Signal")); - - pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS, 0); - - /* find out what's blocked right now */ - - //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. - - */ - - int swerr; - - again: - if ((swerr = sigwait (&blocked, &sig))) { - if (swerr == EINTR) { - goto again; - } else { - cerr << "sigwait failed with " << swerr << endl; - } - } - - cerr << "Signal " << sig << " received\n"; - - if (sig != SIGSEGV) { - - /* 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. - */ - - sigprocmask (SIG_UNBLOCK, &blocked, 0); - } - - shutdown (1); - /*NOTREACHED*/ - return 0; -} - -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; - } - - sigemptyset (&signals); - sigaddset(&signals, SIGHUP); - sigaddset(&signals, SIGINT); - sigaddset(&signals, SIGQUIT); - sigaddset(&signals, SIGPIPE); - sigaddset(&signals, SIGTERM); - sigaddset(&signals, SIGUSR1); - sigaddset(&signals, SIGUSR2); - - - /* 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; - } - - /* start a thread to wait for signals */ - - if (pthread_create_and_store ("signal", &signal_thread_id, 0, signal_thread, 0)) { - cerr << "cannot create signal catching thread" << endl; - return -1; - } - - pthread_detach (signal_thread_id); - return 0; -} - string which_ui_rcfile () { @@ -259,7 +86,6 @@ show_ui_callback (void *arg) ARDOUR_UI * ui = (ARDOUR_UI *) arg; ui->hide_splash(); - ui->show (); return FALSE; } @@ -267,7 +93,7 @@ show_ui_callback (void *arg) void gui_jack_error () { - MessageDialog win (_("Ardour could not connect to JACK."), + MessageDialog win (_("Ardour could not connect to JACK."), false, Gtk::MESSAGE_INFO, (Gtk::ButtonsType)(Gtk::BUTTONS_NONE)); @@ -285,7 +111,11 @@ Please consider the possibilities, and perhaps (re)start JACK.")); win.show_all (); win.set_position (Gtk::WIN_POS_CENTER); - /* we just don't care about the result */ + if (!no_splash) { + ui->hide_splash (); + } + + /* we just don't care about the result, but we want to block */ win.run (); } @@ -293,63 +123,56 @@ Please consider the possibilities, and perhaps (re)start JACK.")); static bool maybe_load_session () { + /* If no session name is given: we're not loading a session yet, nor creating a new one */ + if (!session_name.length()) { + ui->hide_splash (); + if (!Config->get_no_new_session_dialog()) { + if (!ui->new_session ()) { + return false; + } + } - /* load session, if given */ - string name, path; - - if (session_name.length()){ - bool isnew; - - if (Session::find_session (session_name, path, name, isnew)) { - error << string_compose(_("could not load command line session \"%1\""), session_name) << endmsg; - } else { - - if (new_session) { - - /* command line required that the session be new */ - - if (isnew) { - - /* popup the new session dialog - once everything else is OK. - */ - - Glib::signal_idle().connect (bind (mem_fun (*ui, &ARDOUR_UI::cmdline_new_session), path)); - ui->set_will_create_new_session_automatically (true); - - } else { - - /* it wasn't new, but we require a new session */ + return true; + } - error << string_compose (_("\n\nA session named \"%1\" already exists.\n\ -To avoid this message, start ardour as \"ardour %1"), path) - << endmsg; - return false; - } + /* Load session or start the new session dialog */ + string name, path; - } else { + bool isnew; - /* 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; - } + if (Session::find_session (session_name, path, name, isnew)) { + error << string_compose(_("could not load command line session \"%1\""), session_name) << endmsg; + return false; + } - ui->load_session (path, name); - } + if (!new_session) { + + /* Loading a session, but the session doesn't exist */ + 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; } - if (no_splash) { - ui->show(); + if (ui->load_session (path, name)) { + /* it failed */ + return false; } } else { + + /* TODO: This bit of code doesn't work properly yet + Glib::signal_idle().connect (bind (mem_fun (*ui, &ARDOUR_UI::cmdline_new_session), path)); + ui->set_will_create_new_session_automatically (true); + */ + + /* Show the NSD */ ui->hide_splash (); if (!Config->get_no_new_session_dialog()) { - ui->new_session (true); + if (!ui->new_session ()) { + return false; + } } } @@ -371,17 +194,20 @@ int main (int argc, char *argv[]) ARDOUR::AudioEngine *engine; vector null_file_list; - // needs a better home. Glib::thread_init(); - gtk_set_locale (); - (void) bindtextdomain (PACKAGE, LOCALEDIR); + (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); @@ -399,13 +225,7 @@ int main (int argc, char *argv[]) cout << _("Ardour/GTK ") << 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 + << ardour_svn_revision #ifdef __GNUC__ << _(" and GCC version ") << __VERSION__ #endif @@ -417,7 +237,7 @@ int main (int argc, char *argv[]) } if (no_splash) { - cerr << _("Copyright (C) 1999-2006 Paul Davis") << endl + cerr << _("Copyright (C) 1999-2007 Paul Davis") << endl << _("Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel Baker") << endl << endl << _("Ardour comes with ABSOLUTELY NO WARRANTY") << endl @@ -427,36 +247,50 @@ int main (int argc, char *argv[]) << endl; } - try { - ui = new ARDOUR_UI (&argc, &argv, which_ui_rcfile()); - } + /* some GUI objects need this */ + + PBD::ID::init (); - catch (failed_constructor& err) { + try { + ui = new ARDOUR_UI (&argc, &argv, which_ui_rcfile()); + } catch (failed_constructor& err) { error << _("could not create ARDOUR GUI") << endmsg; exit (1); } + if (!keybindings_path.empty()) { + ui->set_keybindings_path (keybindings_path); + } if (!no_splash) { ui->show_splash (); if (session_name.length()) { - gtk_timeout_add (4000, show_ui_callback, ui); + g_timeout_add (4000, show_ui_callback, ui); } } - - try { - engine = new ARDOUR::AudioEngine (jack_client_name); - ARDOUR::init (*engine, use_vst, try_hw_optimization); + + try { + ARDOUR::init (use_vst, try_hw_optimization); + setup_gtk_ardour_enums (); + Config->set_current_owner (ConfigVariableBase::Interface); + + try { + engine = new ARDOUR::AudioEngine (jack_client_name); + } catch (AudioEngine::NoBackendAvailable& err) { + gui_jack_error (); + error << string_compose (_("Could not connect to JACK server as \"%1\""), jack_client_name) << endmsg; + return -1; + } + 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; } + ui->start_engine (); + if (maybe_load_session ()) { ui->run (text_receiver); ui = 0; @@ -464,7 +298,14 @@ int main (int argc, char *argv[]) delete engine; ARDOUR::cleanup (); - shutdown (0); + + if (ui) { + ui->kill(); + } + + pthread_cancel_all (); + + exit (0); return 0; }