X-Git-Url: https://git.piment-noir.org/?p=deb_shairplay.git;a=blobdiff_plain;f=src%2Fshairplay.c;h=64cc864a33cd4e393e327144738af23eaeb995c6;hp=9cccf030d0945d09143e9395e4c6aa2f34c66a1d;hb=f95c4d2da37b73c2010b4332831cb1f582314b6b;hpb=258e9fb821c5ee9b39628d1694e48d5518e28ac3

diff --git a/src/shairplay.c b/src/shairplay.c
index 9cccf03..64cc864 100644
--- a/src/shairplay.c
+++ b/src/shairplay.c
@@ -6,7 +6,7 @@
 #include <assert.h>
 
 #ifdef WIN32
-#include <windows.h>
+# include <windows.h>
 #endif
 
 #include <shairplay/dnssd.h>
@@ -39,6 +39,33 @@ typedef struct {
 
 static int running;
 
+#ifndef WIN32
+
+#include <signal.h>
+static void
+signal_handler(int sig)
+{
+	switch (sig) {
+	case SIGINT:
+	case SIGTERM:
+		running = 0;
+		break;
+	}
+}
+static void
+init_signals(void)
+{
+	struct sigaction sigact;
+
+	sigact.sa_handler = signal_handler;
+	sigemptyset(&sigact.sa_mask);
+	sigact.sa_flags = 0;
+	sigaction(SIGINT, &sigact, NULL);
+	sigaction(SIGTERM, &sigact, NULL);
+}
+
+#endif
+
 
 static ao_device *
 audio_open_device(shairplay_options_t *opt, int bits, int channels, int samplerate)
@@ -238,6 +265,10 @@ main(int argc, char *argv[])
 
 	int error;
 
+#ifndef WIN32
+	init_signals();
+#endif
+
 	memset(&options, 0, sizeof(options));
 	if (parse_options(&options, argc, argv)) {
 		return 0;
@@ -278,13 +309,12 @@ main(int argc, char *argv[])
 		fprintf(stderr, "------------------------------------------\n");
 		fprintf(stderr, "You could try the following resolutions based on your OS:\n");
 		fprintf(stderr, "Windows: Try installing http://support.apple.com/kb/DL999\n");
-		fprintf(stderr, "Debian/Ubuntu: Try installing libavahi-compat-libdnssd1 package\n");
+		fprintf(stderr, "Debian/Ubuntu: Try installing libavahi-compat-libdnssd-dev package\n");
 		raop_destroy(raop);
 		return -1;
 	}
 
 	dnssd_register_raop(dnssd, options.apname, options.port, hwaddr, sizeof(hwaddr), 0);
-	dnssd_register_airplay(dnssd, options.apname, 1234, hwaddr, sizeof(hwaddr));
 
 	running = 1;
 	while (running) {