X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=audiod.c;h=94afa1cf16fb9d9e7271ef6e5904085ef443589c;hb=f23669d91a09066b7ecd7b07a74bea8fad61ad39;hp=798142f39a348ec6f0ac74e689332d18a1318444;hpb=b0a115ed731885c92fcd8b6fb1c89b97dca410e8;p=paraslash.git

diff --git a/audiod.c b/audiod.c
index 798142f3..94afa1cf 100644
--- a/audiod.c
+++ b/audiod.c
@@ -309,7 +309,7 @@ static int get_play_time_slot_num(void)
  */
 char *get_time_string(void)
 {
-	int ret, seconds = 0, length;
+	int ret, seconds = 0, length = stat_task->length_seconds;
 	struct timeval *tmp, sum, sss, /* server stream start */
 		rstime, /* receiver start time */
 		wstime, /* writer start time */
@@ -321,19 +321,18 @@ char *get_time_string(void)
 
 	if (audiod_status == AUDIOD_OFF)
 		goto empty;
-	if (!(stat_task->vss_status & VSS_STATUS_FLAG_PLAYING)) {
-		if (stat_task->length_seconds) /* paused */
+	if (stat_task->server_stream_start.tv_sec == 0) {
+		if (stat_task->vss_status & VSS_STATUS_FLAG_PLAYING)
+			goto out; /* server is about to change file */
+		if (length > 0) /* paused */
 			return NULL;
 		goto empty; /* stopped */
 	}
-	if (audiod_status == AUDIOD_ON && !s)
-		goto empty;
 	/*
 	 * Valid status items and playing, set length and tmp to the stream
 	 * start. We use the slot info and fall back to the info from current
 	 * status items if no slot info is available.
 	 */
-	length = stat_task->length_seconds;
 	tmp = &stat_task->server_stream_start;
 	if (s && s->wns && s->wns[0].btrn) { /* writer active in this slot */
 		btr_get_node_start(s->wns[0].btrn, &wstime);
@@ -352,7 +351,7 @@ char *get_time_string(void)
 		tv_diff(tmp, &stat_task->sa_time_diff, &sss);
 	else
 		tv_add(tmp, &stat_task->sa_time_diff, &sss);
-	if (!s || !s->wns || !s->wns[0].btrn) {
+	if (!s || !s->wns || !s->wns[0].btrn || wstime.tv_sec == 0) {
 		struct timeval diff;
 		tv_diff(now, &sss, &diff);
 		seconds = diff.tv_sec + stat_task->offset_seconds;