X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=stat.c;h=514ca3f3b7f065e6d1a06e4a0528581eb6ff047b;hp=23db42460a54e961de946d7dd409d5f2d8596e21;hb=debe0b5737118f7f1806cc133e81549d88340bfd;hpb=471684761a2039bbc89aa1e3c33c62de6bef86cf

diff --git a/stat.c b/stat.c
index 23db4246..514ca3f3 100644
--- 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",
 
@@ -71,12 +74,14 @@ const char *status_item_list[NUM_STAT_ITEMS] = {
 	[SI_UPTIME] = "uptime",
 	[SI_OFFSET] = "offset",
 
-	[SI_LENGTH] = "length",
+	[SI_SECONDS_TOTAL] = "seconds_total",
 	[SI_STREAM_START] = "stream_start",
 	[SI_CURRENT_TIME] = "current_time",
 
 	[SI_AUDIOD_UPTIME] = "audiod_uptime",
-	[SI_SELECTOR] = "dbtool"
+	[SI_IMAGE_ID] = "image_id",
+	[SI_LYRICS_ID] = "lyrics_id",
+	[SI_DURATION] = "duration"
 };
 
 static void dump_stat_client_list(void)
@@ -166,7 +171,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 +183,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;
 }
 
@@ -216,54 +221,3 @@ int stat_line_valid(const char *line)
 	return -E_UNKNOWN_STAT_ITEM;
 }
 
-/**
- * call a custom function for each complete line
- *
- * \param buf the buffer containing data seperated by newlines
- * \param n the number of bytes in \a buf
- * \param line_handler the custom function
- *
- * If \a line_handler is \p NULL, return number of complete lines in buf.
- * Otherwise, call \a line_handler for each complete line.  The rest of the
- * buffer (last chunk containing incomplete line is moved to the beginning of
- * the buffer.
- *
- * \return If line_handler is not NULL, this function returns the number
- * of bytes not handled to \a line_handler.
- */
-size_t for_each_line(char *buf, size_t n, void (*line_handler)(char *))
-{
-	char *start = buf, *end;
-	size_t num_lines = 0, bytes_left = n;
-
-//	PARA_INFO_LOG("buf: %s", buf);
-	while (bytes_left) {
-		char *next_null;
-		char *next_cr;
-
-		next_cr = memchr(start, '\n', bytes_left);
-		next_null = memchr(start, '\0', bytes_left);
-		if (!next_cr && !next_null)
-			break;
-		if (next_cr && next_null) {
-			end = next_cr < next_null? next_cr : next_null;
-		} else if (next_null) {
-			end = next_null;
-		} else
-			end = next_cr;
-		num_lines++;
-		if (line_handler) {
-			*end = '\0';
-//			PARA_INFO_LOG("calling line handler: %s\n", start);
-			line_handler(start);
-		}
-		start = ++end;
-		bytes_left = buf + n - start;
-	}
-	if (!line_handler)
-		return num_lines;
-	if (bytes_left && bytes_left != n)
-		memmove(buf, start, bytes_left);
-	return bytes_left;
-}
-