update tranzport code

[ardour.git] / gtk2_ardour / main.cc

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index d2550754f69e9ac650611b49d091baf3cab7a131..6182182d38bb2b0113f88b1b97617bfcbe083983 100644 (file)
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -259,7 +259,6 @@ show_ui_callback (void *arg)
        ARDOUR_UI * ui = (ARDOUR_UI *) arg;
 
        ui->hide_splash();
-       ui->show ();
        
        return FALSE;
 }
@@ -267,7 +266,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 +284,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 ();
 }
@@ -325,10 +328,12 @@ To create it from the command line, start ardour as \"ardour --new %1"), path) <
                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); */
 
+               /*  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()) {
@@ -354,9 +359,6 @@ 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);
@@ -382,13 +384,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 
+            << gtk_ardour_revision
 #ifdef __GNUC__
             << _(" and GCC version ") << __VERSION__ 
 #endif
@@ -410,11 +406,12 @@ int 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);
        }
@@ -423,23 +420,30 @@ int main (int argc, char *argv[])
        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 (use_vst, try_hw_optimization);
-               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;
        } 
 
+
        if (maybe_load_session ()) {
                ui->run (text_receiver);
                ui = 0;