X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.h;h=74d598cf4004678b9cb05db1e930a4099d29eb4a;hp=0068177950ebc1dbfe0fe58f5074d04afcb6fa6a;hb=4d3f9f6c22281f9abb5d59d378a10303420641b7;hpb=c8862b9e246b4ef6ff1fe103946e18cf2537ecde diff --git a/audiod.h b/audiod.h index 00681779..74d598cf 100644 --- a/audiod.h +++ b/audiod.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2008 Andre Noll + * Copyright (C) 2006-2009 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -67,41 +67,6 @@ struct slot_info { struct writer_node_group *wng; }; -/** - * the task for obtaining para_server's status (para_client stat) - * - * \sa struct task, struct sched - */ -struct status_task { - /** the associated task structure of audiod */ - struct task task; - /** client data associated with the stat task */ - struct private_client_data *pcd; - /** the array of status items sent by para_server */ - char *stat_item_values[NUM_STAT_ITEMS]; - /** do not restart client command until this time */ - struct timeval restart_barrier; - /** last time we received status data from para_server */ - struct timeval last_status_read; - /** the offset value announced by para_server */ - int offset_seconds; - /** the length of the current audio file as announced by para_server */ - int length_seconds; - /** the start of the current stream from the view of para_server */ - struct timeval server_stream_start; - /** the average time deviation between para_server and para_audiod */ - struct timeval sa_time_diff; - /** whether client time is ahead of server time */ - int sa_time_diff_sign; - /** non-zero if para_server's status is "playing" */ - int playing; - /** number of times the clock difference is to be checked */ - unsigned clock_diff_count; - /** when to start the next check for clock difference */ - struct timeval clock_diff_barrier; -}; - -extern struct status_task *stat_task; extern struct slot_info slot[MAX_STREAM_SLOTS]; extern struct audiod_args_info conf; extern int audiod_status; @@ -110,6 +75,7 @@ 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); /** iterate over all slots */ #define FOR_EACH_SLOT(_slot) for (_slot = 0; _slot < MAX_STREAM_SLOTS; _slot++)