Generic MIDI control now saves+restores its state; PBD::ID now requires a buffer...

[ardour.git] / gtk2_ardour / main.cc

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 778355c858414b1793c509ef36df39cbbd84b7e0..049ef29ead0dae3f2bd4e3d938a7f5f45afb84a2 100644 (file)
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -267,7 +267,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 +285,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 ();
 }
@@ -293,60 +297,43 @@ Please consider the possibilities, and perhaps (re)start JACK."));
 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);
+               }
 
-       /* 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 */
+               return true;
+       }
 
-                                       error << string_compose (_("\n\nA session named \"%1\" already exists.\n\
-To avoid this message, start ardour as \"ardour %1"), path)
-                                             << endmsg;
-                                       return false;
-                               }
+       /* Load session or start the new session dialog */
+       string name, path;
 
-                       } else {
+       bool isnew;
 
-                               /* 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;
-                               }
+       if (Session::find_session (session_name, path, name, isnew)) {
+               error << string_compose(_("could not load command line session \"%1\""), session_name) << endmsg;
+               return false;
+       }
 
-                               ui->load_session (path, name);
-                       }
+       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;
                }
 
-               if (no_splash) {
-                       ui->show();
-               }
+               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);
@@ -371,9 +358,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);
@@ -399,13 +383,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 
+            << ARDOUR::get_ardour_revision ()
 #ifdef __GNUC__
             << _(" and GCC version ") << __VERSION__ 
 #endif
@@ -427,11 +405,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);
        }
@@ -440,23 +419,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 (*engine, 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;