Allow markers to be glued to bar/beat time. Fixes #1815.

[ardour.git] / gtk2_ardour / main.cc

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index bf1e6a39781cc97ebb209072ab94c9d5a11eaf6b..e8cf2ac69cf8cfda4f41ca819e3cc8473039995b 100644 (file)
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -55,7 +55,6 @@ using namespace Gtk;
 using namespace ARDOUR_COMMAND_LINE;
 using namespace ARDOUR;
 using namespace PBD;
-using namespace sigc;
 
 TextReceiver text_receiver ("ardour");
 
@@ -67,7 +66,7 @@ static const char* localedir = LOCALEDIR;
 void
 gui_jack_error ()
 {
-       MessageDialog win (_("Ardour could not connect to JACK."),
+       MessageDialog win (string_compose (_("%1 could not connect to JACK."), PROGRAM_NAME),
                     false,
                     Gtk::MESSAGE_INFO,
                     (Gtk::ButtonsType)(Gtk::BUTTONS_NONE));
@@ -282,10 +281,52 @@ fixup_bundle_environment ()
 
 #endif
 
+static gboolean
+tell_about_jack_death (void* /* ignored */)
+{
+       if (AudioEngine::instance()->processed_frames() == 0) {
+               /* died during startup */
+               MessageDialog msg (_("JACK exited"), false, Gtk::MESSAGE_INFO, Gtk::BUTTONS_OK);
+               msg.set_position (Gtk::WIN_POS_CENTER);
+               msg.set_secondary_text (_(
+"JACK exited unexpectedly, and without notifying Ardour.\n\
+\n\
+This could be due to misconfiguration or to an error inside JACK.\n\
+\n\
+Click OK to exit Ardour."));
+    
+               msg.run ();
+               _exit (0);
+               
+       } else {
+
+               /* engine has already run, so this is a mid-session JACK death */
+               
+               MessageDialog* msg = manage (new MessageDialog (_("JACK exited"), false, Gtk::MESSAGE_INFO, Gtk::BUTTONS_NONE));
+               msg->set_secondary_text (_(
+"JACK exited unexpectedly, and without notifying Ardour.\n\
+\n\
+This is probably due to an error inside JACK. You should restart JACK\n\
+and reconnect Ardour to it, or exit Ardour now. You cannot save your\n\
+session at this time, because we would lose your connection information.\n"));
+               msg->present ();
+       }
+       return false; /* do not call again */
+}
+
 static void
-sigpipe_handler (int /*sig*/)
+sigpipe_handler (int sig)
 {
-       cerr << _("SIGPIPE received - JACK has probably died") << endl;
+        /* XXX fix this so that we do this again after a reconnect to JACK
+         */
+
+        static bool done_the_jack_thing = false;
+       
+       if (!done_the_jack_thing) {
+               AudioEngine::instance()->died ();
+               g_idle_add (tell_about_jack_death, 0);
+               done_the_jack_thing =  true;
+       }
 }
 
 #ifdef HAVE_LV2
@@ -312,14 +353,16 @@ int main (int argc, char *argv[])
        fixup_bundle_environment ();
 #endif
 
-       Glib::thread_init();
+       if (!Glib::thread_supported())
+               Glib::thread_init();
+
        gtk_set_locale ();
 
 #ifdef VST_SUPPORT
-       /* this does some magic that is needed to make GTK and Wine's own
-          X11 client interact properly.
-       */
-       gui_init (&argc, &argv);
+       /* this does some magic that is needed to make GTK and Wine's own
+          X11 client interact properly.
+       */
+       gui_init (&argc, &argv);
 #endif
 
        (void) bindtextdomain (PACKAGE, localedir);
@@ -347,7 +390,7 @@ int main (int argc, char *argv[])
                return curvetest (curvetest_file);
        }
 
-       cout << _("Ardour/GTK ")
+       cout << PROGRAM_NAME
             << VERSIONSTRING
             << _(" (built using ")
             << svn_revision
@@ -362,10 +405,10 @@ int main (int argc, char *argv[])
        }
 
        if (no_splash) {
-               cerr << _("Copyright (C) 1999-2008 Paul Davis") << endl
+               cerr << _("Copyright (C) 1999-2010 Paul Davis") << endl
                     << _("Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel Baker") << endl
                     << endl
-                    << _("Ardour comes with ABSOLUTELY NO WARRANTY") << endl
+                    << string_compose (_("%1 comes with ABSOLUTELY NO WARRANTY"), PROGRAM_NAME) << endl
                     << _("not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.") << endl
                     << _("This is free software, and you are welcome to redistribute it ") << endl
                     << _("under certain conditions; see the source for copying conditions.")
@@ -380,7 +423,7 @@ int main (int argc, char *argv[])
                cerr << _("Cannot install SIGPIPE error handler") << endl;
        }
 
-        try {
+       try {
                ui = new ARDOUR_UI (&argc, &argv);
        } catch (failed_constructor& err) {
                error << _("could not create ARDOUR GUI") << endmsg;
@@ -392,6 +435,7 @@ int main (int argc, char *argv[])
 
        ARDOUR::cleanup ();
        pthread_cancel_all ();
+
 #ifdef HAVE_LV2
        close_external_ui_windows();
 #endif