X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.h;h=fec1e352c810f8fe31d256ecdb13a2a11875bbfb;hp=74d598cf4004678b9cb05db1e930a4099d29eb4a;hb=bc8abdf149e4f26d20b5728e270063215da2f2c3;hpb=4d3f9f6c22281f9abb5d59d378a10303420641b7

diff --git a/audiod.h b/audiod.h
index 74d598cf..fec1e352 100644
--- 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 */
@@ -49,22 +43,26 @@ struct audiod_command {
 };
 
 /**
- * describes one instance of a receiver-filter-writer chain
+ * 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 */
+	/** Number of the audio format in this slot. */
 	int format;
-	/** writer start time */
-	struct timeval wstime;
-	/** the receiver info associated with this slot */
+	/** The stream_start status item announced by para_server.  */
+	struct timeval server_stream_start;
+	/** The offset status item announced by para_server. */
+	unsigned offset_seconds;
+	/** The seconds_total status item announced by para_server. */
+	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];
@@ -74,8 +72,11 @@ extern int audiod_status;
 void __noreturn clean_exit(int status, const char *msg);
 int handle_connect(int accept_fd);
 void audiod_status_dump(void);
-void dump_empty_status(void);
-char *get_time_string(struct timeval *newest_stime);
+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++)