X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=9f664e178309c39e70a64d7ea55f6a29f0c5f6cf;hp=e66373cc87ed475682655a9dac17baec92144496;hb=3923f936294f9f900dc8c6a1c0fe84f0e2852dca;hpb=69a7e7aa11d8bf9b05d6431c57276befbc9b35a3

diff --git a/audiod.c b/audiod.c
index e66373cc..9f664e17 100644
--- a/audiod.c
+++ b/audiod.c
@@ -7,9 +7,7 @@
 /** \file audiod.c the paraslash's audio daemon */
 #include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
 #include <signal.h>
-#include <openssl/rc4.h>
 #include <stdbool.h>
 
 #include "para.h"
@@ -33,6 +31,7 @@
 #include "write.h"
 #include "write_common.h"
 #include "signal.h"
+#include "version.h"
 
 /** define the array of error lists needed by para_audiod */
 INIT_AUDIOD_ERRLISTS;
@@ -1083,17 +1082,17 @@ static void try_to_close_slot(int slot_num)
 
 	if (s->format < 0)
 		return;
-	if (s->receiver_node && s->receiver_node->task.error != -E_TASK_UNREGISTERED)
+	if (s->receiver_node && s->receiver_node->task.error >= 0)
 		return;
 	for (i = 0; i < a->num_filters; i++)
-		if (s->fns && s->fns[i].task.error != -E_TASK_UNREGISTERED)
+		if (s->fns && s->fns[i].task.error >= 0)
 			return;
 	if (a->num_writers > 0) {
 		for (i = 0; i < a->num_writers; i++)
-			if (s->wns && s->wns[i].task.error != -E_TASK_UNREGISTERED)
+			if (s->wns && s->wns[i].task.error >= 0)
 				return;
 	} else {
-		if (s->wns && s->wns[0].task.error != -E_TASK_UNREGISTERED)
+		if (s->wns && s->wns[0].task.error >= 0)
 			return;
 	}
 	PARA_INFO_LOG("closing slot %d\n", slot_num);
@@ -1174,7 +1173,7 @@ static void status_post_select(__a_unused struct sched *s, struct task *t)
 			kill_btrn(st->ct->btrn, &st->ct->task, -E_AUDIOD_OFF);
 			goto out;
 		}
-		if (st->ct->task.error != -E_TASK_UNREGISTERED)
+		if (st->ct->task.error >= 0)
 			goto out;
 		close_stat_pipe();
 		st->clock_diff_count = conf.clock_diff_count_arg;
@@ -1185,7 +1184,7 @@ static void status_post_select(__a_unused struct sched *s, struct task *t)
 		size_t sz;
 		int ret;
 		if (st->ct->task.error < 0) {
-			if (st->ct->task.error != -E_TASK_UNREGISTERED)
+			if (st->ct->task.error >= 0)
 				goto out;
 			close_stat_pipe();
 			goto out;