X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=d12b65e5a49193346adc798be3b28293e16bb99c;hp=a6408d87f79cc6d17aff487af2539d68441a6391;hb=a94872914afe2e9cc96bb9f8f931a34fb471bb11;hpb=decf72f578ef0cb7a3bc3a81834ef64c2b19c91f

diff --git a/audiod.c b/audiod.c
index a6408d87..d12b65e5 100644
--- a/audiod.c
+++ b/audiod.c
@@ -196,13 +196,25 @@ char *get_time_string(int slot_num)
 	}
 	if (audiod_status == AUDIOD_ON && !s)
 		goto empty;
-	/* valid status items and playing */
+	/*
+	 * 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) { /* 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;
+		btr_get_node_start(s->wns[0].btrn, &wstime);
+		if (wstime.tv_sec != 0) { /* writer wrote something */
+			if (s->server_stream_start.tv_sec == 0) {
+				/* copy status info to slot */
+				s->server_stream_start = stat_task->server_stream_start;
+				s->offset_seconds = stat_task->offset_seconds;
+				s->seconds_total = stat_task->length_seconds;
+			}
+			length = s->seconds_total;
+			tmp = &s->server_stream_start;
+		}
 	}
 	if (stat_task->sa_time_diff_sign > 0)
 		tv_diff(tmp, &stat_task->sa_time_diff, &sss);
@@ -214,7 +226,6 @@ char *get_time_string(int slot_num)
 		seconds = diff.tv_sec + stat_task->offset_seconds;
 		goto out;
 	}
-	btr_get_node_start(s->wns[0].btrn, &wstime);
 	tv_diff(now, &wstime, &wtime);
 	//PARA_CRIT_LOG("offset %d\n", s->offset_seconds);
 	seconds = s->offset_seconds;
@@ -329,8 +340,12 @@ static void close_receiver(int slot_num)
 
 static void writer_cleanup(struct writer_node *wn)
 {
-	struct writer *w = writers + wn->writer_num;
+	struct writer *w;
 
+	if (!wn)
+		return;
+	w = writers + wn->writer_num;
+	PARA_INFO_LOG("closing %s\n", writer_names[wn->writer_num]);
 	w->close(wn);
 	btr_free_node(wn->btrn);
 }
@@ -361,8 +376,11 @@ static void _close_filters(struct slot_info *s)
 		return;
 	for (i = 0; i < a->num_filters; i++) {
 		struct filter_node *fn = s->fns + i;
-		struct filter *f = filters + fn->filter_num;
+		struct filter *f;
 
+		if (!fn)
+			continue;
+		f = filters + fn->filter_num;
 		f->close(fn);
 		btr_free_node(fn->btrn);
 	}
@@ -476,10 +494,6 @@ static void open_writers(struct slot_info *s)
 			register_writer_node(wn, parent);
 		}
 	}
-	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;
 }
 
 /* returns slot num on success */
@@ -586,12 +600,14 @@ static int open_current_receiver(struct sched *s)
 		 * this period begins to avoid restarting the receiver that
 		 * belongs to the file just completed.
 		 */
-		if (stat_task->server_stream_start.tv_sec != 0)
+		if (stat_task->server_stream_start.tv_sec != 0) {
 			sched_request_timeout_ms(100, s);
+			return -1;
+		}
 	}
 	if (tv_diff(now, &afi[cafn].restart_barrier, &diff) < 0) {
 		if (tv_diff(&s->timeout, &diff, NULL) > 0)
-			s->timeout = diff;
+			sched_request_timeout(&diff, s);
 		else
 			sched_min_delay(s);
 		return -1;