X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=audiod.c;h=32b6895dcf0da9393538e649f7241878b89e96c0;hb=c0058725d4cf8f1ec229db0d0189a7d0fab78d36;hp=75073ec22bcc2a09c8a548f57db1560b8df0cef8;hpb=67cb641c126769af98289539ff3425dfbf5e12e2;p=paraslash.git

diff --git a/audiod.c b/audiod.c
index 75073ec2..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;
@@ -596,7 +598,8 @@ static void open_filters(struct slot_info *s)
 			EMBRACE(.name = f->name, .parent = parent,
 				.handler = f->execute, .context = fn));
 
-		f->open(fn);
+		if (f->open)
+			f->open(fn);
 		sprintf(buf, "%s (slot %d)", f->name, (int)(s - slot));
 		fn->task = task_register(&(struct task_info) {
 			.name = buf,
@@ -763,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++;
@@ -1377,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);
@@ -1506,8 +1509,11 @@ int main(int argc, char *argv[])
 	daemon_set_priority(conf.priority_arg);
 	daemon_drop_privileges_or_die(conf.user_arg, conf.group_arg);
 	parse_config_or_die();
-	daemon_init_colors_or_die(conf.color_arg, color_arg_auto, color_arg_no,
-		conf.logfile_given, conf.log_color_arg, conf.log_color_given);
+	if (daemon_init_colors_or_die(conf.color_arg, color_arg_auto, color_arg_no,
+		conf.logfile_given)) {
+			for (i = 0; i < conf.log_color_given; i++)
+				daemon_set_log_color_or_die(conf.log_color_arg[i]);
+	}
 	init_random_seed_or_die();
 	daemon_set_flag(DF_LOG_TIME);
 	daemon_set_flag(DF_LOG_HOSTNAME);