X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=380e53e0fbae30cf9c949afea6d247d71396eb37;hp=1663dad3d88e8bb90ec69e2f7cffa1bcbd2ce64e;hb=de7b5b177b8ad295820bd14c00b049fd8a5ec21f;hpb=081ea8699e6a309c44446884b8c3752529d96a25

diff --git a/audiod.c b/audiod.c
index 1663dad3..380e53e0 100644
--- a/audiod.c
+++ b/audiod.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -92,6 +92,7 @@ struct status_task {
 	struct timeval restart_barrier;
 	/** Last time we received status data from para_server. */
 	struct timeval last_status_read;
+	size_t min_iqs;
 	/** The offset value announced by para_server. */
 	int offset_seconds;
 	/** The length of the current audio file as announced by para_server. */
@@ -142,7 +143,6 @@ static struct status_task status_task_struct;
  * \sa struct status_task
  */
 static struct status_task *stat_task = &status_task_struct;
-static struct timeval initial_delay_barrier;
 
 /**
  * the task for handling audiod commands
@@ -348,7 +348,6 @@ static void close_receiver(int slot_num)
 {
 	struct slot_info *s = &slot[slot_num];
 	struct audio_format_info *a;
-	struct timeval restart_delay = {0, 200 * 1000};
 
 	if (s->format < 0 || !s->receiver_node)
 		return;
@@ -359,7 +358,6 @@ 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, &restart_delay, &afi[s->format].restart_barrier);
 }
 
 static void writer_cleanup(struct writer_node *wn)
@@ -549,16 +547,13 @@ static int open_receiver(int format)
 	int ret, slot_num;
 	struct receiver *r = a->receiver;
 	struct receiver_node *rn;
-	const struct timeval restart_delay = {2, 0};
 
+	tv_add(now, &(struct timeval)EMBRACE(2, 0), &a->restart_barrier);
 	ret = get_empty_slot();
 	if (ret < 0)
-		goto err;
+		return ret;
 	slot_num = ret;
-	s = &slot[slot_num];
-	s->format = format;
-	s->receiver_node = para_calloc(sizeof(struct receiver_node));
-	rn = s->receiver_node;
+	rn = para_calloc(sizeof(*rn));
 	rn->receiver = r;
 	rn->conf = a->receiver_conf;
 	rn->btrn = btr_new_node(&(struct btr_node_description)
@@ -567,39 +562,37 @@ static int open_receiver(int format)
 	if (ret < 0) {
 		btr_free_node(rn->btrn);
 		free(rn);
-		s->receiver_node = NULL;
-		goto err;
+		return ret;
 	}
+	s = &slot[slot_num];
+	s->format = format;
+	s->receiver_node = rn;
 	PARA_NOTICE_LOG("started %s: %s receiver in slot %d\n",
-		audio_formats[s->format], r->name, slot_num);
+		audio_formats[format], r->name, slot_num);
 	rn->task.pre_select = r->pre_select;
 	rn->task.post_select = r->post_select;
 	sprintf(rn->task.status, "%s receiver node", r->name);
 	register_task(&rn->task);
-	ret = slot_num;
-err:
-	if (ret < 0)
-		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
-	tv_add(now, &restart_delay, &afi[format].restart_barrier);
-	return ret;
+	return slot_num;
 }
 
-/* return: 0: Not running, 1: Running, -1: Running but eof (or error) */
-static int receiver_running(int format)
+static bool receiver_running(void)
 {
-	int i, ret = 0;
+	int i;
+	long unsigned ss1 = stat_task->server_stream_start.tv_sec;
 
 	FOR_EACH_SLOT(i) {
 		struct slot_info *s = &slot[i];
-		if (s->format != format)
-			continue;
+		long unsigned ss2 = s->server_stream_start.tv_sec;
+
 		if (!s->receiver_node)
 			continue;
 		if (s->receiver_node->task.error >= 0)
-			return 1;
-		ret = -1;
+			return true;
+		if (ss1 == ss2)
+			return true;
 	}
-	return ret;
+	return false;
 }
 
 /**
@@ -637,15 +630,20 @@ struct btr_node *audiod_get_btr_root(void)
 /* whether a new instance of a decoder should be started. */
 static bool must_start_decoder(void)
 {
-	int ret, cafn = stat_task->current_audio_format_num;
+	int cafn = stat_task->current_audio_format_num;
+	unsigned vs = stat_task->vss_status;
 
-	if (cafn < 0 || !stat_task->ct)
+	if (audiod_status != AUDIOD_ON)
+		return false;
+	if (cafn < 0)
+		return false;
+	if (!stat_task->ct)
+		return false;
+	if (vs & VSS_STATUS_FLAG_NEXT)
 		return false;
-	/* Do nothing if the 'N' flag is set or the 'P' flag is unset */
-	if (stat_task->vss_status != VSS_STATUS_FLAG_PLAYING)
+	if (!(vs & VSS_STATUS_FLAG_PLAYING))
 		return false;
-	ret = receiver_running(cafn);
-	if (ret != 0) /* already running */
+	if (receiver_running())
 		return false;
 	if (tv_diff(now, &afi[cafn].restart_barrier, NULL) < 0)
 		return false;
@@ -719,20 +717,8 @@ static int update_item(int itemnum, char *buf)
 		break;
 	case SI_STREAM_START:
 		if (sscanf(buf, "%lu.%lu", &sec, &usec) == 2) {
-			struct timeval a_start, delay;
-			delay.tv_sec = conf.stream_delay_arg / 1000;
-			delay.tv_usec = (conf.stream_delay_arg % 1000) * 1000;
 			stat_task->server_stream_start.tv_sec = sec;
 			stat_task->server_stream_start.tv_usec = usec;
-			if (compute_time_diff(NULL) > 2) {
-				if (stat_task->sa_time_diff_sign < 0)
-					tv_add(&stat_task->server_stream_start,
-						&stat_task->sa_time_diff, &a_start);
-				else
-					tv_diff(&stat_task->server_stream_start,
-						&stat_task->sa_time_diff, &a_start);
-				tv_add(&a_start, &delay, &initial_delay_barrier);
-			}
 		}
 		break;
 	case SI_CURRENT_TIME:
@@ -1042,6 +1028,7 @@ static void command_post_select(struct sched *s, struct task *t)
 	ret = handle_connect(ct->fd);
 	if (ret < 0)
 		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+	audiod_status_dump();
 }
 
 static void init_command_task(struct command_task *ct)
@@ -1142,8 +1129,10 @@ static void start_stop_decoders(void)
 	if (!must_start_decoder())
 		return;
 	ret = open_receiver(stat_task->current_audio_format_num);
-	if (ret < 0)
+	if (ret < 0) {
+		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 		return;
+	}
 	sl = slot + ret;
 	a = afi + sl->format;
 	if (a->num_filters)
@@ -1163,10 +1152,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);
@@ -1202,25 +1200,28 @@ static void status_post_select(__a_unused struct sched *s, struct task *t)
 		}
 		if (st->ct->status != CL_RECEIVING)
 			goto out;
-		ret = btr_node_status(st->btrn, 0, BTR_NT_LEAF);
-		if (ret <= 0)
+		ret = btr_node_status(st->btrn, st->min_iqs, BTR_NT_LEAF);
+		if (ret <= 0) {
+			struct timeval diff;
+			tv_diff(now, &st->last_status_read, &diff);
+			if (diff.tv_sec > 61)
+				kill_btrn(st->ct->btrn, &st->ct->task,
+					-E_STATUS_TIMEOUT);
 			goto out;
+		}
+		btr_merge(st->btrn, st->min_iqs);
 		sz = btr_next_buffer(st->btrn, &buf);
 		ret = for_each_stat_item(buf, sz, update_item);
 		if (ret < 0) {
 			kill_btrn(st->ct->btrn, &st->ct->task, ret);
 			goto out;
 		}
-		if (sz != ret)
+		if (sz != ret) {
+			btr_consume(st->btrn, sz - ret);
 			st->last_status_read = *now;
-		else {
-			struct timeval diff;
-			tv_diff(now, &st->last_status_read, &diff);
-			if (diff.tv_sec > 61)
-				kill_btrn(st->ct->btrn, &st->ct->task,
-					-E_STATUS_TIMEOUT);
-		}
-		btr_consume(st->btrn, sz - ret);
+			st->min_iqs = 0;
+		} else /* current status item crosses buffers */
+			st->min_iqs = sz + 1;
 		goto out;
 	}
 	if (tv_diff(now, &st->restart_barrier, NULL) < 0)