X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmain.cc;h=e8cf2ac69cf8cfda4f41ca819e3cc8473039995b;hb=5b520324ceab2559723b4ef5127301fa61ff4846;hp=406ad714e94cbc074a27ae1ed7af2cee3418d971;hpb=c38e02285fda1fd7966c9e4ad85994445247e6a6;p=ardour.git

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 406ad714e9..e8cf2ac69c 100644
--- 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
@@ -349,7 +390,7 @@ int main (int argc, char *argv[])
 		return curvetest (curvetest_file);
 	}
 
-	cout << _("Ardour/GTK ")
+	cout << PROGRAM_NAME
 	     << VERSIONSTRING
 	     << _(" (built using ")
 	     << svn_revision
@@ -364,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.")
@@ -393,7 +434,7 @@ int main (int argc, char *argv[])
 	ui = 0;
 
 	ARDOUR::cleanup ();
-	// pthread_cancel ();
+	pthread_cancel_all ();
 
 #ifdef HAVE_LV2
 	close_external_ui_windows();