X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod_command.c;h=0920162067f346f97003e766f3c6d77702298142;hp=a26d1931478a053f0c59991206338b84cd42b7bf;hb=13ba5f96e64bd0f3157a6fe73ed7b950ec9c5ea7;hpb=870fcd0379ab096184f42481541d668694da7c83

diff --git a/audiod_command.c b/audiod_command.c
index a26d1931..09201620 100644
--- a/audiod_command.c
+++ b/audiod_command.c
@@ -15,9 +15,9 @@
 #include <netdb.h>
 #include <lopsub.h>
 
+#include "audiod.lsg.h"
 #include "para.h"
 #include "audiod_cmd.lsg.h"
-#include "audiod.cmdline.h"
 #include "list.h"
 #include "sched.h"
 #include "buffer_tree.h"
@@ -82,7 +82,7 @@ static INITIALIZED_LIST_HEAD(client_list);
 static int num_clients;
 
 /** The list of all status items used by para_{server,audiod,gui}. */
-const char *status_item_list[] = {STATUS_ITEM_ARRAY};
+const char *status_item_list[] = {STATUS_ITEMS};
 
 static void dump_stat_client_list(void)
 {
@@ -426,7 +426,7 @@ int handle_connect(int accept_fd, fd_set *rfds)
 	uid_t uid;
 	const struct lls_command *cmd;
 	struct lls_parse_result *lpr;
-	char *errctx;
+	char *errctx = NULL;
 	const struct audiod_command_info *aci;
 
 	ret = para_accept(accept_fd, rfds, &unix_addr, sizeof(struct sockaddr_un), &clifd);
@@ -481,41 +481,41 @@ void audiod_status_dump(bool force)
 {
 	char *old, *new;
 
-	old = stat_item_values[SI_PLAY_TIME];
+	old = stat_item_values[SI_play_time];
 	new = get_time_string();
 	if (new) {
 		if (force || !old || strcmp(old, new)) {
 			free(old);
-			stat_item_values[SI_PLAY_TIME] = new;
-			stat_client_write_item(SI_PLAY_TIME);
+			stat_item_values[SI_play_time] = new;
+			stat_client_write_item(SI_play_time);
 		} else
 			free(new);
 	}
 
 	new = daemon_get_uptime_str(now);
-	old = stat_item_values[SI_AUDIOD_UPTIME];
+	old = stat_item_values[SI_audiod_uptime];
 	if (force || !old || strcmp(old, new)) {
 		free(old);
-		stat_item_values[SI_AUDIOD_UPTIME] = new;
-		stat_client_write_item(SI_AUDIOD_UPTIME);
+		stat_item_values[SI_audiod_uptime] = new;
+		stat_client_write_item(SI_audiod_uptime);
 	} else
 		free(new);
 
-	old = stat_item_values[SI_AUDIOD_STATUS];
+	old = stat_item_values[SI_audiod_status];
 	new = audiod_status_string();
 	if (force || !old || strcmp(old, new)) {
 		free(old);
-		stat_item_values[SI_AUDIOD_STATUS] = new;
-		stat_client_write_item(SI_AUDIOD_STATUS);
+		stat_item_values[SI_audiod_status] = new;
+		stat_client_write_item(SI_audiod_status);
 	} else
 		free(new);
 
-	old = stat_item_values[SI_DECODER_FLAGS];
+	old = stat_item_values[SI_decoder_flags];
 	new = audiod_get_decoder_flags();
 	if (force || !old || strcmp(old, new)) {
 		free(old);
-		stat_item_values[SI_DECODER_FLAGS] = new;
-		stat_client_write_item(SI_DECODER_FLAGS);
+		stat_item_values[SI_decoder_flags] = new;
+		stat_client_write_item(SI_decoder_flags);
 	} else
 		free(new);
 }