X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=audiod.c;h=32b6895dcf0da9393538e649f7241878b89e96c0;hb=f012a742a9b342c51e3c6bef22eaab0f39cb9e46;hp=bd97f15e22e1629e8b9b0895420438dd5fb46194;hpb=121015ff5cdbe6af7b84f6245ebe62fe2a52a859;p=paraslash.git

diff --git a/audiod.c b/audiod.c
index bd97f15e..32b6895d 100644
--- a/audiod.c
+++ b/audiod.c
@@ -39,9 +39,10 @@
 #include "signal.h"
 #include "version.h"
 
+/** Array of error strings. */
+DEFINE_PARA_ERRLIST;
+
 __printf_2_3 void (*para_log)(int, const char*, ...) = daemon_log;
-/** define the array of error lists needed by para_audiod */
-INIT_AUDIOD_ERRLISTS;
 /** define the array containing all supported audio formats */
 const char *audio_formats[] = {AUDIOD_AUDIO_FORMAT_ARRAY NULL};
 
@@ -317,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)
@@ -330,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) {
@@ -351,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;