using namespace Gtk;
using namespace GTK_ARDOUR;
using namespace ARDOUR;
+using namespace PBD;
using namespace sigc;
TextReceiver text_receiver ("ardour");
shutdown (1);
}
-static void
-handler2 (int sig, siginfo_t* ctxt, void* ignored)
-{
- handler (sig);
-}
-
static void *
signal_thread (void *arg)
{
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 {
+ cerr << "Loading ui configuration file " << rcfile << endl;
}
-
+
return rcfile;
}
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));
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 ();
}
-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<Glib::ustring> null_file_list;
}
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
<< 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 (!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);
+ 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 ();
- if (!Config->get_no_new_session_dialog()) {
- ui->new_session (true);
- }
+ if (maybe_load_session ()) {
+ ui->run (text_receiver);
+ ui = 0;
}
- ui->run (text_receiver);
- ui = 0;
-
- out:
delete engine;
ARDOUR::cleanup ();
shutdown (0);
+
+ return 0;
}
+#ifdef VST_SUPPORT
+} // end of extern C block
+#endif
projects / ardour.git / blobdiff