X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=3a2607defc2576b476628524102b5d8367985b89;hp=3194501bfc7e6e0a5e687842be70a57cb84e76b2;hb=2607a94854dbc9d9415887cb9fa954e9227c1c65;hpb=4d3f9f6c22281f9abb5d59d378a10303420641b7

diff --git a/audiod.c b/audiod.c
index 3194501b..3a2607de 100644
--- a/audiod.c
+++ b/audiod.c
@@ -66,6 +66,14 @@ struct audio_format_info {
  * */
 struct slot_info slot[MAX_STREAM_SLOTS];
 
+/** The vss status flags audiod is interested in. */
+enum vss_status_flags {
+	/** Whether the 'N' flag is set. */
+	VSS_STATUS_FLAG_NEXT = 1,
+	/** The 'P' flag is set. */
+	VSS_STATUS_FLAG_PLAYING = 2,
+};
+
 /**
  * The task for obtaining para_server's status (para_client stat).
  *
@@ -90,8 +98,8 @@ struct status_task {
 	struct timeval sa_time_diff;
 	/** Whether client time is ahead of server time. */
 	int sa_time_diff_sign;
-	/** Non-zero if para_server's status is "playing". */
-	int playing;
+	/** The 'P' and the 'N' flags as announced by para_server. */
+	enum vss_status_flags vss_status;
 	/** Number of times the clock difference is to be checked. */
 	unsigned clock_diff_count;
 	/** When to start the next check for clock difference. */
@@ -164,53 +172,66 @@ int get_audio_format_num(char *name)
 	return -E_UNSUPPORTED_AUDIO_FORMAT;
 }
 
-char *get_time_string(struct timeval *newest_stime)
+char *get_time_string(int slot_num)
 {
-	struct timeval diff, adj_stream_start, tmp;
-	int total = 0, use_server_time = 1,
-		length_seconds = stat_task->length_seconds;
+	int ret, seconds = 0, length;
+	struct timeval *tmp, sum, sss, /* server stream start */
+		wtime, /* now - writer start */
+		rskip; /* receiver start - sss */
+	struct slot_info *s = slot_num < 0? NULL : &slot[slot_num];
 
-	if (!stat_task->playing) {
-		if (length_seconds)
+	if (audiod_status == AUDIOD_OFF)
+		goto empty;
+	if (!(stat_task->vss_status & VSS_STATUS_FLAG_PLAYING)) {
+		if (stat_task->length_seconds) /* paused */
 			return NULL;
-		return make_message("%s:\n", status_item_list[SI_PLAY_TIME]);
+		goto empty; /* stopped */
+	}
+	if (audiod_status == AUDIOD_ON && !s)
+		goto empty;
+	/* valid status items and playing */
+	if (s) { /* writer active in this slot */
+		length = s->seconds_total;
+		tmp = &s->server_stream_start;
+	} else { /* standby mode, rely on status items */
+		length = stat_task->length_seconds;
+		tmp = &stat_task->server_stream_start;
 	}
-	if (audiod_status == AUDIOD_OFF)
-		goto out;
 	if (stat_task->sa_time_diff_sign > 0)
-		tv_diff(&stat_task->server_stream_start, &stat_task->sa_time_diff,
-			&adj_stream_start);
+		tv_diff(tmp, &stat_task->sa_time_diff, &sss);
 	else
-		tv_add(&stat_task->server_stream_start, &stat_task->sa_time_diff,
-			&adj_stream_start);
-	tmp = adj_stream_start;
-	if (newest_stime && audiod_status == AUDIOD_ON) {
-		tv_diff(newest_stime, &adj_stream_start, &diff);
-		if (tv2ms(&diff) < 5000) {
-			tmp = *newest_stime;
-			use_server_time = 0;
-		}
+		tv_add(tmp, &stat_task->sa_time_diff, &sss);
+	if (!s) {
+		struct timeval diff;
+		tv_diff(now, &sss, &diff);
+		seconds = diff.tv_sec + stat_task->offset_seconds;
+		goto out;
 	}
-	tv_diff(now, &tmp, &diff);
-	total = diff.tv_sec + stat_task->offset_seconds;
-	if (total > length_seconds)
-		total = length_seconds;
-	if (total < 0)
-		total = 0;
+	tv_diff(now, &s->wstime, &wtime);
+	seconds = s->offset_seconds;
+	ret = tv_diff(&s->rstime, &sss, &rskip);
+	if (ret > 0) { /* audiod was started in the middle of the stream */
+		tv_add(&wtime, &rskip, &sum);
+		seconds += sum.tv_sec;
+	} else
+		seconds += wtime.tv_sec;
 out:
+	seconds = PARA_MIN(seconds, length);
+	seconds = PARA_MAX(seconds, 0);
 	return make_message(
 		"%s: %s%d:%02d [%d:%02d] (%d%%/%d:%02d)\n",
 		status_item_list[SI_PLAY_TIME],
-		use_server_time? "~" : "",
-		total / 60,
-		total % 60,
-		(length_seconds - total) / 60,
-		(length_seconds - total) % 60,
-		length_seconds? (total * 100 + length_seconds / 2) /
-			length_seconds : 0,
-		length_seconds / 60,
-		length_seconds % 60
+		s? "" : "~",
+		seconds / 60,
+		seconds % 60,
+		(length - seconds) / 60,
+		(length - seconds) % 60,
+		length? (seconds * 100 + length / 2) / length : 0,
+		length / 60,
+		length % 60
 	);
+empty:
+	return make_message("%s:\n", status_item_list[SI_PLAY_TIME]);
 }
 
 static int want_colors(void)
@@ -421,6 +442,10 @@ static void open_writers(int slot_num)
 		return;
 	}
 	s->wstime = *now;
+	s->server_stream_start = stat_task->server_stream_start.tv_sec?
+		stat_task->server_stream_start : *now;
+	s->offset_seconds = stat_task->offset_seconds;
+	s->seconds_total = stat_task->length_seconds;
 	activate_inactive_grab_clients(slot_num, s->format, s->fc);
 }
 
@@ -452,6 +477,7 @@ static int open_receiver(int format)
 		audio_formats[s->format], a->receiver->name, slot_num);
 	rn->task.pre_select = a->receiver->pre_select;
 	rn->task.post_select = a->receiver->post_select;
+	s->rstime = *now;
 	sprintf(rn->task.status, "%s receiver node", rn->receiver->name);
 	register_task(&rn->task);
 	ret = 1;
@@ -462,32 +488,54 @@ err:
 	return ret;
 }
 
+/* return: 0: Not running, 1: Running, -1: Running but eof (or error) */
 static int receiver_running(int format)
 {
-	int i;
+	int i, ret = 0;
 
 	FOR_EACH_SLOT(i) {
 		struct slot_info *s = &slot[i];
-		if (s->format == format && s->receiver_node)
+		if (s->format != format)
+			continue;
+		if (!s->receiver_node)
+			continue;
+		if (s->receiver_node->task.error >= 0)
 			return 1;
+		ret = -1;
 	}
-	return 0;
+	return ret;
 }
 
-static int open_current_receiver(struct sched *s)
+static void open_current_receiver(struct sched *s)
 {
 	struct timeval diff;
-	int cafn = stat_task->current_audio_format_num;
+	int ret, cafn = stat_task->current_audio_format_num;
 
 	if (cafn < 0 || !stat_task->ct)
-		return 0;
-	if (receiver_running(cafn))
-		return 0;
+		return;
+	/* Do nothing if the 'N' flag is set or the 'P' flag is unset */
+	if (stat_task->vss_status != VSS_STATUS_FLAG_PLAYING)
+		return;
+	ret = receiver_running(cafn);
+	if (ret > 0) /* already running and not eof */
+		return;
+	if (ret < 0) { /* eof */
+		/*
+		 * para_server uses a zero start time during the announcement
+		 * period, i.e. before it sends the first chunk. Wait until
+		 * this period begins to avoid restarting the receiver that
+		 * belongs to the file just completed.
+		 */
+		if (stat_task->server_stream_start.tv_sec)
+			return;
+	}
 	if (tv_diff(now, &afi[cafn].restart_barrier, &diff) < 0) {
+		/* avoid busy loop */
 		s->timeout = diff;
-		return 0;
+		return;
 	}
-	return open_receiver(cafn) < 0? 0 : 1;
+	/* start a new receiver */
+	open_receiver(cafn);
 }
 
 static unsigned compute_time_diff(const struct timeval *status_time)
@@ -556,9 +604,12 @@ static int check_stat_line(char *line, __a_unused void *data)
 	stat_item_values[itemnum] = para_strdup(line);
 	ilen = strlen(status_item_list[itemnum]);
 	switch (itemnum) {
-	case SI_STATUS:
-		stat_task->playing = strstr(line, "playing")? 1 : 0;
-		PARA_INFO_LOG("stat task playing: %d\n", stat_task->playing);
+	case SI_STATUS_FLAGS:
+		stat_task->vss_status = 0;
+		if (strchr(line, 'N'))
+			stat_task->vss_status |= VSS_STATUS_FLAG_NEXT;
+		if (strchr(line, 'P'))
+			stat_task->vss_status |= VSS_STATUS_FLAG_PLAYING;
 		break;
 	case SI_OFFSET:
 		stat_task->offset_seconds = atoi(line + ilen + 1);
@@ -899,8 +950,8 @@ static void close_stat_pipe(void)
 	dump_empty_status();
 	stat_task->length_seconds = 0;
 	stat_task->offset_seconds = 0;
+	stat_task->vss_status = 0;
 	audiod_status_dump();
-	stat_task->playing = 0;
 }
 
 /**
@@ -961,7 +1012,8 @@ static void start_stop_decoders(struct sched *s)
 
 	FOR_EACH_SLOT(i)
 		try_to_close_slot(i);
-	if (audiod_status != AUDIOD_ON || !stat_task->playing)
+	if (audiod_status != AUDIOD_ON ||
+			!(stat_task->vss_status & VSS_STATUS_FLAG_PLAYING))
 		return kill_all_decoders(-E_NOT_PLAYING);
 	open_current_receiver(s);
 	FOR_EACH_SLOT(i) {