/*
- 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
#include <pbd/error.h>
#include <pbd/textreceiver.h>
-#include <pbd/platform.h>
-#include <pbd/platform_factory.h>
#include <pbd/failed_constructor.h>
#include <pbd/pthread_utils.h>
which_ui_rcfile ()
{
string rcfile;
- char* envvar;
+ char* env;
- if ((envvar = getenv("ARDOUR_UI_RC")) == 0) {
- rcfile = find_config_file ("ardour2_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;
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\
\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 ();
+ /* we just don't care about the result */
- Main::run ();
+ win.run ();
+}
+
+static bool
+maybe_load_session ()
+{
+
+ /* 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;
+ return false;
+ }
+
+ } 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;
+ return false;
+ }
+
+ ui->load_session (path, name);
+ }
+ }
+
+ if (no_splash) {
+ ui->show();
+ }
+
+ } else {
+ ui->hide_splash ();
+ if (!Config->get_no_new_session_dialog()) {
+ ui->new_session (true);
+ }
+ }
+
+ return true;
}
int
ARDOUR::AudioEngine *engine;
vector<Glib::ustring> null_file_list;
+ // needs a better home.
+ Glib::thread_init();
+
gtk_set_locale ();
(void) bindtextdomain (PACKAGE, LOCALEDIR);
pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS, 0);
- catch_signals ();
+ // catch_signals ();
text_receiver.listen_to (error);
text_receiver.listen_to (info);
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
}
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
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);
- }
- }
-
- try {
-
+ if (maybe_load_session ()) {
ui->run (text_receiver);
-
- } catch (...) {
-
+ ui = 0;
}
-
- ui = 0;
out:
delete engine;
ARDOUR::cleanup ();
shutdown (0);
+
+ /* just another commit forcing change */
}
projects / ardour.git / blobdiff