X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=64ea8a51efeeb13cb65f86d1ea417120679ff2f4;hp=778318cebc2b8958e26b378987a4842c615a237d;hb=6cb4ad9d0b46a6926a3ec68db192a869325d4583;hpb=840725e10602abd8187428924040f4bf3e04594c

diff --git a/audiod.c b/audiod.c
index 778318ce..64ea8a51 100644
--- a/audiod.c
+++ b/audiod.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -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);
@@ -1219,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 */
@@ -1293,17 +1298,14 @@ __noreturn static void print_help_and_die(void)
 
 static void init_colors_or_die(void)
 {
-	int ret, i;
+	int i;
 
 	if (!want_colors())
 		return;
 	daemon_set_default_log_colors();
 	daemon_set_flag(DF_COLOR_LOG);
-	for (i = 0; i < conf.log_color_given; i++) {
-		ret = daemon_set_log_color(conf.log_color_arg[i]);
-		if (ret < 0)
-			exit(EXIT_FAILURE);
-	}
+	for (i = 0; i < conf.log_color_given; i++)
+		daemon_set_log_color_or_die(conf.log_color_arg[i]);
 }
 
 /**