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

diff --git a/audiod.c b/audiod.c
index 32047a1f..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)
@@ -633,6 +635,8 @@ static bool must_start_decoder(void)
 	int cafn = stat_task->current_audio_format_num;
 	unsigned vs = stat_task->vss_status;
 
+	if (audiod_status != AUDIOD_ON)
+		return false;
 	if (cafn < 0)
 		return false;
 	if (!stat_task->ct)
@@ -861,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);
@@ -978,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);
+	int signum;
 
-	if (!FD_ISSET(st->fd, &s->rfds))
-		return;
-
-	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");
 	}
 }
@@ -1021,11 +1023,10 @@ 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();
 }
 
 static void init_command_task(struct command_task *ct)
@@ -1149,10 +1150,19 @@ 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);
+	/*
+	 * If para_server is playing we'd like to have a smooth time display
+	 * even if we are running in standby mode. So we request a timeout that
+	 * expires at the next full second.
+	 */
+	if (stat_task->vss_status & VSS_STATUS_FLAG_PLAYING)
+		sched_request_timeout_ms(1000 - now->tv_usec / 1000, s);
 	return;
 min_delay:
 	sched_min_delay(s);
@@ -1212,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 */