X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=stat.c;h=59ac4235eb28da84ac2cd154a4425ca539f3b16b;hb=84f3cda92d0fb3d072b1a2d9bf8c2156c18d6398;hp=8a2f8df49b282038ef4a4dd6007136ad0cbfaef7;hpb=07caf51b881e2f8e93fbcf529ea1a9b14a40f82e;p=paraslash.git

diff --git a/stat.c b/stat.c
index 8a2f8df4..59ac4235 100644
--- a/stat.c
+++ b/stat.c
@@ -44,45 +44,8 @@ static struct list_head client_list;
 static int initialized;
 static int num_clients;
 
-/**
- * the list of all status items sent by para_server/para_audiod
- */
-const char *status_item_list[NUM_STAT_ITEMS] = {
-	[SI_BASENAME] = "basnemae",
-	[SI_STATUS] = "status",
-	[SI_NUM_PLAYED] = "num_played",
-
-	[SI_MTIME] = "mtime",
-	[SI_LENGTH_MIN] = "length_min",
-	[SI_LENGTH_SEC] = "length_sec",
-
-	[SI_FILE_SIZE] = "file_size",
-	[SI_STATUS_FLAGS] = "status_flags",
-	[SI_FORMAT] = "format",
-
-	[SI_SCORE] = "score",
-	[SI_AUDIO_INFO1] = "audio_file_info1",
-	[SI_AUDIO_INFO2] = "audio_file_info2",
-
-	[SI_AUDIO_INFO3] = "audio_file_info3",
-	[SI_AFS_MODE] = "afs_mode",
-	[SI_ATTRIBUTES] = "attributes",
-
-	[SI_DBINFO3] = "dbinfo3",
-	[SI_DECODER_FLAGS] = "decoder_flags",
-	[SI_AUDIOD_STATUS] = "audiod_status",
-
-	[SI_PLAY_TIME] = "play_time",
-	[SI_UPTIME] = "uptime",
-	[SI_OFFSET] = "offset",
-
-	[SI_LENGTH] = "length",
-	[SI_STREAM_START] = "stream_start",
-	[SI_CURRENT_TIME] = "current_time",
-
-	[SI_AUDIOD_UPTIME] = "audiod_uptime",
-	[SI_SELECTOR] = "dbtool"
-};
+/** The list of all status items used by para_{server,audiod,gui}. */
+const char *status_item_list[] = {STATUS_ITEM_ARRAY};
 
 static void dump_stat_client_list(void)
 {
@@ -186,7 +149,7 @@ int stat_item_valid(const char *item)
 		PARA_ERROR_LOG("%s\n", "no item");
 		return -E_UNKNOWN_STAT_ITEM;
 	}
-	FOR_EACH_STAT_ITEM(i)
+	FOR_EACH_STATUS_ITEM(i)
 		if (!strcmp(status_item_list[i], item))
 			return i;
 	PARA_ERROR_LOG("invalid stat item: %s\n", item);
@@ -210,7 +173,7 @@ int stat_line_valid(const char *line)
 	if (!line || !*line)
 		return -E_UNKNOWN_STAT_ITEM;
 	line_len = strlen(line);
-	FOR_EACH_STAT_ITEM(i) {
+	FOR_EACH_STATUS_ITEM(i) {
 		const char *s = status_item_list[i];
 		size_t item_len = strlen(s);