X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.h;h=5bd41c4fa00f52f3b6b24d4508967ecd707d418d;hp=ca22160d3fa378bd1849cb16549b85a6b409c254;hb=56955f95584f51709320262f7d2e0ea79301d346;hpb=15d21005beb3b173ba9909e522782201fdf0d5b8 diff --git a/audiod.h b/audiod.h index ca22160d..5bd41c4f 100644 --- a/audiod.h +++ b/audiod.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2007 Andre Noll + * Copyright (C) 2006-2009 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -76,9 +76,7 @@ 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]; + struct client_task *ct; /** do not restart client command until this time */ struct timeval restart_barrier; /** last time we received status data from para_server */ @@ -99,18 +97,19 @@ struct status_task { unsigned clock_diff_count; /** when to start the next check for clock difference */ struct timeval clock_diff_barrier; + /** Number of the audio format as announced by para_server. */ + int current_audio_format_num; }; -extern struct status_task *stat_task; extern struct slot_info slot[MAX_STREAM_SLOTS]; extern struct audiod_args_info conf; extern int audiod_status; -extern const char *status_item_list[NUM_STAT_ITEMS]; 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++)