X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmain.cc;h=3e0d6d4e6292c175748e6bb3b8d713e666843e1e;hb=486020b4032da9bbb20fafd83ec6f10263c892e5;hp=2aaf2ccdd2d3db3cb747f7633bc98a4863123101;hpb=3436df6eabaefa19b2572a2765e6d8ac08942c9d;p=ardour.git diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index 2aaf2ccdd2..3e0d6d4e62 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2001-2004 Paul Davis + Copyright (C) 2001-2006 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 @@ -31,8 +31,6 @@ #include #include -#include -#include #include #include @@ -46,6 +44,7 @@ #include #include +#include "svn_revision.h" #include "version.h" #include "ardour_ui.h" #include "opts.h" @@ -55,12 +54,9 @@ using namespace Gtk; using namespace GTK_ARDOUR; using namespace ARDOUR; +using namespace PBD; using namespace sigc; -Transmitter error (Transmitter::Error); -Transmitter info (Transmitter::Info); -Transmitter fatal (Transmitter::Fatal); -Transmitter warning (Transmitter::Warning); TextReceiver text_receiver ("ardour"); extern int curvetest (string); @@ -108,12 +104,6 @@ handler (int sig) shutdown (1); } -static void -handler2 (int sig, siginfo_t* ctxt, void* ignored) -{ - handler (sig); -} - static void * signal_thread (void *arg) { @@ -245,16 +235,20 @@ string which_ui_rcfile () { string rcfile; - char* envvar; + char* env; - if ((envvar = getenv("ARDOUR_UI_RC")) == 0) { - rcfile = find_config_file ("ardour_ui.rc"); + if ((env = getenv ("ARDOUR2_UI_RC")) != 0 && strlen (env)) { + rcfile = env; + } else { + rcfile = "ardour2_ui.rc"; + } + + rcfile = find_config_file (rcfile); - if (rcfile.length() == 0) { - warning << _("Without a UI style file, ardour will look strange.\n Please set ARDOUR_UI_RC to point to a valid UI style file") << endmsg; - } + 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; } else { - rcfile = envvar; + cerr << "Loading ui configuration file " << rcfile << endl; } return rcfile; @@ -266,32 +260,18 @@ show_ui_callback (void *arg) ARDOUR_UI * ui = (ARDOUR_UI *) arg; ui->hide_splash(); - ui->show (); return FALSE; } -gint -jack_fooey (GdkEventAny* ignored) -{ - Main::quit (); - return FALSE; -} - -void -jack_foobar () -{ - Main::quit (); -} - void gui_jack_error () { - Window win (Gtk::WINDOW_POPUP); - VBox vpacker; - Button ok (_("OK")); - Label label (_("Ardour could not connect to JACK.\n\ -There are several possible reasons:\n\ + 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\ @@ -299,27 +279,83 @@ There are several possible reasons:\n\ \n\ Please consider the possibilities, and perhaps (re)start JACK.")); - vpacker.set_spacing (12); - vpacker.pack_start (label); - vpacker.pack_start (ok, false, false); + win.add_button (Stock::QUIT, RESPONSE_CLOSE); + win.set_default_response (RESPONSE_CLOSE); - win.set_title (_("ardour: unplugged")); - win.set_border_width (7); - win.add (vpacker); win.show_all (); - win.signal_delete_event().connect (sigc::ptr_fun (jack_fooey)); - win.add_events (Gdk::BUTTON_RELEASE_MASK|Gdk::BUTTON_PRESS_MASK); win.set_position (Gtk::WIN_POS_CENTER); - ok.signal_clicked().connect (sigc::ptr_fun (jack_foobar)); - - ok.grab_focus (); + if (!no_splash) { + ui->hide_splash (); + } + + /* we just don't care about the result, but we want to block */ - Main::run (); + win.run (); } -int -main (int argc, char *argv[]) +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()) { + ui->new_session (true); + } + + return true; + } + + /* Load session or start the new session dialog */ + string name, path; + + bool isnew; + + if (Session::find_session (session_name, path, name, isnew)) { + error << string_compose(_("could not load command line session \"%1\""), session_name) << endmsg; + return false; + } + + 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; + } + + ui->load_session (path, name); + + } 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); + } + } + + return true; +} + +#ifdef VST_SUPPORT +/* this is called from the entry point of a wine-compiled + executable that is linked against gtk2_ardour built + as a shared library. +*/ +extern "C" { +int ardour_main (int argc, char *argv[]) +#else +int main (int argc, char *argv[]) +#endif + { ARDOUR::AudioEngine *engine; vector null_file_list; @@ -331,7 +367,7 @@ main (int argc, char *argv[]) pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS, 0); - catch_signals (); + // catch_signals (); text_receiver.listen_to (error); text_receiver.listen_to (info); @@ -345,29 +381,11 @@ main (int argc, char *argv[]) if (curvetest_file) { return curvetest (curvetest_file); } - - /* desktop standard themes: just say no! */ - - if (getenv("GTK_RC_FILES")) { - unsetenv("GTK_RC_FILES"); - } - - if (getenv("GTK2_RC_FILES")) { - unsetenv("GTK_RC_FILES"); - } - - RC::set_default_files (null_file_list); 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 @@ -379,7 +397,7 @@ main (int argc, char *argv[]) } if (no_splash) { - cerr << _("Copyright (C) 1999-2005 Paul Davis") << endl + cerr << _("Copyright (C) 1999-2006 Paul Davis") << endl << _("Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel Baker") << endl << endl << _("Ardour comes with ABSOLUTELY NO WARRANTY") << endl @@ -389,105 +407,60 @@ main (int argc, char *argv[]) << endl; } - try { - ui = new ARDOUR_UI (&argc, &argv, which_ui_rcfile()); - } + // needs a better home. + Glib::thread_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 { + + + try { engine = new ARDOUR::AudioEngine (jack_client_name); - ARDOUR::init (*engine, use_vst, try_hw_optimization, handler2); - 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; + } + + + try { + ARDOUR::init (use_vst, try_hw_optimization); + Config->set_current_owner (ConfigVariableBase::Interface); + ui->set_engine (*engine); } catch (failed_constructor& err) { error << _("could not initialize Ardour.") << endmsg; return -1; } - /* 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 */ - - error << string_compose (_("\n\nA session named \"%1\" already exists.\n\ -To avoid this message, start ardour as \"ardour %1"), path) - << endmsg; - goto out; - } - - } else { - - /* 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; - goto out; - } - - ui->load_session (path, name); - } - } - - if (no_splash) { - ui->show(); - } - - } else { - ui->hide_splash (); - ui->show (); - if (!Config->get_no_new_session_dialog()) { - ui->new_session (true); - } - } + ui->start_engine (); - if (!ui->set_quit_context ()) { + if (maybe_load_session ()) { ui->run (text_receiver); + ui = 0; } - - ui = 0; - out: delete engine; ARDOUR::cleanup (); shutdown (0); + + return 0; } +#ifdef VST_SUPPORT +} // end of extern C block +#endif