X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.h;h=90ca22c4531d7e968adeafd7e6e32cc3c7be2226;hp=8b416ce56ffdf58e90774ecb4564010c0dd2f387;hb=3010ef96e10cb15d423eef8f9802fbed78744393;hpb=2607a94854dbc9d9415887cb9fa954e9227c1c65 diff --git a/audiod.h b/audiod.h index 8b416ce5..90ca22c4 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 */ @@ -57,10 +51,6 @@ struct audiod_command { 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. */ @@ -71,8 +61,10 @@ struct slot_info { 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]; @@ -82,8 +74,10 @@ 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(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++)