dccp: sort out help text

[paraslash.git] / audiod.h

diff --git a/audiod.h b/audiod.h
index 6946fc7888487eb614ff5dc86a4ea3360d00a104..fec1e352c810f8fe31d256ecdb13a2a11875bbfb 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 */
@@ -51,16 +45,12 @@ struct audiod_command {
 /**
  * Describes one instance of a receiver-filter-writer chain.
  *
- * \sa receiver_node, receiver, filter, filter_node, filter_chain, writer,
- * writer_node, writer_node_group.
+ * \sa receiver_node, receiver, filter, filter_node, writer, writer_node,
+ * writer_node_group.
  */
 struct slot_info {
        /** Number of the audio format in this slot. */
        int format;
-       /** Receiver start time. */
-       struct timeval rstime;
-       /** Writer start time. */
-       struct timeval wstime;
        /** The stream_start status item announced by para_server.  */
        struct timeval server_stream_start;
        /** The offset status item announced by para_server. */
@@ -69,10 +59,10 @@ struct slot_info {
        unsigned seconds_total;
        /** The receiver info associated with this slot. */
        struct receiver_node *receiver_node;
-       /** The active filter chain. */
-       struct filter_chain *fc;
-       /** The active writer node group. */
-       struct writer_node_group *wng;
+       /** The array of filter nodes. */
+       struct filter_node *fns;
+       /** The array of writers attached to the last filter. */
+       struct writer_node *wns;
 };
 
 extern struct slot_info slot[MAX_STREAM_SLOTS];
@@ -83,6 +73,10 @@ void __noreturn clean_exit(int status, const char *msg);
 int handle_connect(int accept_fd);
 void audiod_status_dump(void);
 char *get_time_string(int slot_num);
+struct btr_node *audiod_get_btr_root(void);
+
+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++)