X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.h;h=60de4caf8131368b8684f479f5f24db60fed156e;hp=9c53e6d6500b4dabc83e609ac64b0f427b742def;hb=6442f07bb08eb6e557086587f997b1785ea18ef7;hpb=f513183bb624dc785de48b556cca7a876b0e7754 diff --git a/audiod.h b/audiod.h index 9c53e6d6..60de4caf 100644 --- a/audiod.h +++ b/audiod.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2007 Andre Noll + * Copyright (C) 2006-2008 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,9 +97,10 @@ 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; @@ -110,6 +109,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++)