X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=89b160db527ae9397a2bd2b216b304d6c4c8920f;hp=cc4164fead07425382e539f90261dead037c6279;hb=fd62cf6f3c17ec9f504d3a05be4fd48f969dcb01;hpb=4b260054e8b8c03de7ffdc96b879ceb2be1a1122

diff --git a/audiod.c b/audiod.c
index cc4164fe..89b160db 100644
--- a/audiod.c
+++ b/audiod.c
@@ -191,7 +191,7 @@ int get_audio_format_num(const char *name)
  * It has to to take into account that probably the stream was not started at
  * the beginning of the file, that the clock between the server and the client
  * host may differ and that playback of the stream was delayed, e.g. because
- * the prebuffer filter is used in the filter chain of the given slot.
+ * the prebuffer filter is used in the filter configuration of the given slot.
  *
  * If no writer is active in the given slot, or \a slot_num is negative
  * (indicating that para_audiod runs in standby mode), an approximation based
@@ -358,6 +358,8 @@ static void close_receiver(int slot_num)
 	btr_free_node(s->receiver_node->btrn);
 	free(s->receiver_node);
 	s->receiver_node = NULL;
+	tv_add(now, &(struct timeval)EMBRACE(0, 200 * 1000),
+		&a->restart_barrier);
 }
 
 static void writer_cleanup(struct writer_node *wn)
@@ -863,7 +865,8 @@ static int init_default_filters(void)
 		 * If udp is used to receive this audiod format, add fecdec as
 		 * the first filter.
 		 */
-		if (strcmp(afi[i].receiver->name, "udp") == 0) {
+		if (strcmp(afi[i].receiver->name, "udp") == 0 ||
+				strcmp(afi[i].receiver->name, "dccp") == 0) {
 			tmp = para_strdup("fecdec");
 			add_filter(i, tmp);
 			free(tmp);
@@ -980,19 +983,16 @@ static void signal_pre_select(struct sched *s, struct task *t)
 	para_fd_set(st->fd, &s->rfds, &s->max_fileno);
 }
 
-static void signal_post_select(struct sched *s, struct task *t)
+static void signal_post_select(struct sched *s, __a_unused struct task *t)
 {
-	struct signal_task *st = container_of(t, struct signal_task, task);
-
-	if (!FD_ISSET(st->fd, &s->rfds))
-		return;
+	int signum;
 
-	st->signum = para_next_signal();
-	switch (st->signum) {
+	signum = para_next_signal(&s->rfds);
+	switch (signum) {
 	case SIGINT:
 	case SIGTERM:
 	case SIGHUP:
-		PARA_EMERG_LOG("terminating on signal %d\n", st->signum);
+		PARA_EMERG_LOG("terminating on signal %d\n", signum);
 		clean_exit(EXIT_FAILURE, "caught deadly signal");
 	}
 }
@@ -1023,9 +1023,7 @@ static void command_post_select(struct sched *s, struct task *t)
 		last_status_dump = *now;
 	}
 
-	if (!FD_ISSET(ct->fd, &s->rfds))
-		return;
-	ret = handle_connect(ct->fd);
+	ret = handle_connect(ct->fd, &s->rfds);
 	if (ret < 0)
 		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 	audiod_status_dump();
@@ -1152,7 +1150,9 @@ static void status_pre_select(struct sched *s, struct task *t)
 	ret = btr_node_status(st->btrn, 0, BTR_NT_LEAF);
 	if (ret > 0)
 		goto min_delay;
-	if (!st->ct)
+	if (st->ct && audiod_status == AUDIOD_OFF)
+		goto min_delay;
+	if (!st->ct && audiod_status != AUDIOD_OFF)
 		sched_request_barrier_or_min_delay(&st->restart_barrier, s);
 	if (cafn >= 0)
 		sched_request_barrier(&afi[cafn].restart_barrier, s);
@@ -1222,6 +1222,8 @@ static void status_post_select(__a_unused struct sched *s, struct task *t)
 			st->min_iqs = sz + 1;
 		goto out;
 	}
+	btr_drain(st->btrn);
+	st->current_audio_format_num = -1;
 	if (tv_diff(now, &st->restart_barrier, NULL) < 0)
 		goto out;
 	if (st->clock_diff_count) { /* get status only one time */