X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=stat.c;h=3ba13b7e0d0f7655692e4421e80b30c97e1719a2;hp=ce6adeda2019454acfdf4ca5759e4a29cc4c2e64;hb=e63886e85c55c99e9732e5715b7ce641eff09914;hpb=3689799ede7bba230ca544ac953392b428c3d662 diff --git a/stat.c b/stat.c index ce6adeda..3ba13b7e 100644 --- a/stat.c +++ b/stat.c @@ -44,11 +44,9 @@ 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 - */ +/** The list of all status items used by para_server/para_audiod. */ const char *status_item_list[NUM_STAT_ITEMS] = { - [SI_STATUS_BAR] = "status_bar", + [SI_BASENAME] = "basename", [SI_STATUS] = "status", [SI_NUM_PLAYED] = "num_played", @@ -65,10 +63,10 @@ const char *status_item_list[NUM_STAT_ITEMS] = { [SI_AUDIO_INFO2] = "audio_file_info2", [SI_AUDIO_INFO3] = "audio_file_info3", - [SI_DBINFO1] = "dbinfo1", - [SI_DBINFO2] = "dbinfo2", + [SI_AFS_MODE] = "afs_mode", + [SI_ATTRIBUTES] = "attributes", - [SI_DBINFO3] = "dbinfo3", + [SI_DIRECTORY] = "dir", [SI_DECODER_FLAGS] = "decoder_flags", [SI_AUDIOD_STATUS] = "audiod_status", @@ -171,7 +169,6 @@ void stat_client_write(const char *msg, int itemnum) PARA_DEBUG_LOG("%d client(s)\n", num_clients); } - /** * check if string is a known status item. * @@ -184,12 +181,13 @@ int stat_item_valid(const char *item) { int i; if (!item || !*item) { - PARA_ERROR_LOG("%s\n", "no item"); + PARA_ERROR_LOG("%s\n", "no item"); return -E_UNKNOWN_STAT_ITEM; } FOR_EACH_STAT_ITEM(i) if (!strcmp(status_item_list[i], item)) return i; + PARA_ERROR_LOG("invalid stat item: %s\n", item); return -E_UNKNOWN_STAT_ITEM; }