X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=audiod.c;h=32b6895dcf0da9393538e649f7241878b89e96c0;hb=884f36e554f9c58815bc24cc3f1f033ab30cb7c7;hp=0f082e26504bcc0039be7ca7f4c36349aa7ccca2;hpb=a775408e5d2e3b21dff741b89ff5330b397b5138;p=paraslash.git

diff --git a/audiod.c b/audiod.c
index 0f082e26..32b6895d 100644
--- a/audiod.c
+++ b/audiod.c
@@ -318,6 +318,7 @@ char *get_time_string(void)
 		rskip; /* receiver start - sss */
 	int slot_num = get_play_time_slot_num();
 	struct slot_info *s = slot_num < 0? NULL : &slot[slot_num];
+	bool writer_active = s && s->wns && s->wns[0].btrn;
 	char *msg;
 
 	if (audiod_status == AUDIOD_OFF)
@@ -331,11 +332,11 @@ char *get_time_string(void)
 	}
 	/*
 	 * 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.
+	 * start. We use the writer start time from the slot info and fall back
+	 * to the info from current status items if no writer is active yet.
 	 */
 	tmp = &stat_task->server_stream_start;
-	if (s && s->wns && s->wns[0].btrn) { /* writer active in this slot */
+	if (writer_active) {
 		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) {
@@ -352,7 +353,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 || wstime.tv_sec == 0) {
+	if (!writer_active) {
 		struct timeval diff;
 		tv_diff(now, &sss, &diff);
 		seconds = diff.tv_sec + stat_task->offset_seconds;
@@ -765,7 +766,7 @@ static void compute_time_diff(const struct timeval *status_time)
 	if (count > 5) {
 		int s = tv_diff(&diff, &stat_task->sa_time_diff, &tmp);
 		if (tv_diff(&max_deviation, &tmp, NULL) < 0)
-			PARA_WARNING_LOG("time diff jump: %lims\n",
+			PARA_WARNING_LOG("time diff jump: %lums\n",
 				s * tv2ms(&tmp));
 	}
 	count++;
@@ -1379,7 +1380,7 @@ static int status_post_select(struct sched *s, void *context)
 	if (st->clock_diff_count) { /* get status only one time */
 		char *argv[] = {"audiod", "--", "stat", "-p", "-n=1", NULL};
 		int argc = 5;
-		PARA_INFO_LOG("clock diff count: %d\n", st->clock_diff_count);
+		PARA_INFO_LOG("clock diff count: %u\n", st->clock_diff_count);
 		st->clock_diff_count--;
 		client_open(argc, argv, &st->ct, NULL, NULL, st->btrn, s);
 		set_stat_task_restart_barrier(2);