X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=80d14c485c63106a476ec7d52d4f511163576747;hp=f0ce62587d9c6fc995fe7c99440fa1238e706b49;hb=6442f07bb08eb6e557086587f997b1785ea18ef7;hpb=122af971c336b33df2e7233d3cea3287bbdae712

diff --git a/audiod.c b/audiod.c
index f0ce6258..80d14c48 100644
--- a/audiod.c
+++ b/audiod.c
@@ -15,6 +15,7 @@
 #include "list.h"
 #include "sched.h"
 #include "recv.h"
+#include "ggo.h"
 #include "filter.h"
 #include "grab_client.cmdline.h"
 #include "grab_client.h"
@@ -603,7 +604,7 @@ static int init_writers(void)
 	struct audio_format_info *a;
 
 	init_supported_writers();
-	nw = PARA_MAX(1, conf.writer_given);
+	nw = PARA_MAX(1U, conf.writer_given);
 	PARA_INFO_LOG("maximal number of writers: %d\n", nw);
 	FOR_EACH_AUDIO_FORMAT(i) {
 		a = &afi[i];
@@ -720,7 +721,7 @@ static int init_filters(void)
 	int i, ret, nf;
 
 	filter_init(filters);
-	nf = PARA_MAX(1,  conf.filter_given);
+	nf = PARA_MAX(1U, conf.filter_given);
 	PARA_INFO_LOG("maximal number of filters: %d\n", nf);
 	FOR_EACH_AUDIO_FORMAT(i) {
 		afi[i].filter_conf = para_malloc(nf * sizeof(void *));
@@ -874,11 +875,6 @@ static void close_stat_pipe(void)
 	stat_task->offset_seconds = 0;
 	audiod_status_dump();
 	stat_task->playing = 0;
-	stat_item_values[SI_BASENAME] = make_message(
-		"%s: no connection to para_server\n",
-		status_item_list[SI_BASENAME]);
-	stat_client_write(stat_item_values[SI_BASENAME],
-		SI_BASENAME);
 }
 
 /**
@@ -1035,6 +1031,12 @@ static void status_pre_select(struct sched *s, struct task *t)
 		client_open(argc, argv, &st->ct);
 		set_stat_task_restart_barrier(5);
 	}
+	free(stat_item_values[SI_BASENAME]);
+	stat_item_values[SI_BASENAME] = make_message(
+		"%s: no connection to para_server\n",
+		status_item_list[SI_BASENAME]);
+	stat_client_write(stat_item_values[SI_BASENAME],
+		SI_BASENAME);
 	st->last_status_read = *now;
 out:
 	start_stop_decoders(s);