pulling trunk

[ardour.git] / gtk2_ardour / main.cc

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index edff60632979960745606e18b6059b460a853afe..e9ac25a8f81b0f28e8f781dc6eff69473a43e67e 100644 (file)
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -251,8 +251,10 @@ which_ui_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;
+       } else {
+               cerr << "Loading ui configuration file " << rcfile << endl;
        }
-
+       
        return rcfile;
 }
 
@@ -293,12 +295,81 @@ Please consider the possibilities, and perhaps (re)start JACK."));
        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
 main (int argc, char *argv[])
 {
        ARDOUR::AudioEngine *engine;
        vector<Glib::ustring> null_file_list;
 
+        // needs a better home.
+        Glib::thread_init();
+        
        gtk_set_locale ();
 
        (void)   bindtextdomain (PACKAGE, LOCALEDIR);
@@ -342,7 +413,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
@@ -382,72 +453,16 @@ main (int argc, char *argv[])
                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);
-               }
+       if (maybe_load_session ()) {
+               ui->run (text_receiver);
+               ui = 0;
        }
 
-       ui->run (text_receiver);
-       ui = 0;
-
   out:
        delete engine;
        ARDOUR::cleanup ();
        shutdown (0);
+
+       /* just another commit forcing change */
 }