Fix a bug in the mood line parser.

[paraslash.git] / stat.c

diff --git a/stat.c b/stat.c
index 202dff8fc22970961ea1f2594e6c7db2f85c1965..eefac72c02fe343a1e0d4d19aed7f84387cb8269 100644 (file)
--- a/stat.c
+++ b/stat.c
@@ -8,6 +8,11 @@
  *  \file stat.c functions used for sending/receiving the status of para_server
  *  and para_audiod
  */
+
+
+#include <sys/types.h>
+#include <dirent.h>
+
 #include "para.h"
 #include "close_on_fork.h"
 #include "list.h"
@@ -39,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",
 
@@ -60,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",
 
@@ -76,7 +79,8 @@ const char *status_item_list[NUM_STAT_ITEMS] = {
        [SI_CURRENT_TIME] = "current_time",
 
        [SI_AUDIOD_UPTIME] = "audiod_uptime",
-       [SI_SELECTOR] = "dbtool"
+       [SI_IMAGE_ID] = "image_id",
+       [SI_LYRICS_ID] = "lyrics_id"
 };
 
 static void dump_stat_client_list(void)
@@ -166,7 +170,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.
  *
@@ -179,12 +182,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;
 }