Merge branch 'master' into next

[paraslash.git] / audiod.h

diff --git a/audiod.h b/audiod.h
index 6946fc7888487eb614ff5dc86a4ea3360d00a104..2d8fec1a24b9827ac8bd2e2ab0616639025ae14b 100644 (file)
--- a/audiod.h
+++ b/audiod.h
@@ -8,7 +8,7 @@
 
 
 int num_filters(int audio_format_num);
-int get_audio_format_num(char *name);
+int get_audio_format_num(const char *name);
 
 /** enum of audio formats supported by para_audiod */
 enum {AUDIOD_AUDIO_FORMATS_ENUM};
@@ -34,12 +34,6 @@ struct audiod_command {
        const char *name;
        /** pointer to the function that handles the command */
        int (*handler)(int, int, char**);
-       /**
-        * if the command prefers to handle the full line (rather than the usual
-        * argv[] array), it stores a pointer to the corresponding line handling
-        * function here. In this case, the above \a handler pointer must be NULL.
-        */
-       int (*line_handler)(int, char*);
        /** one-line description of the command */
        const char *description;
        /** summary of the command line options */
@@ -84,5 +78,8 @@ int handle_connect(int accept_fd);
 void audiod_status_dump(void);
 char *get_time_string(int slot_num);
 
+void stat_client_write_item(int item_num);
+void clear_and_dump_items(void);
+
 /** iterate over all slots */
 #define FOR_EACH_SLOT(_slot) for (_slot = 0; _slot < MAX_STREAM_SLOTS; _slot++)