X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.h;h=077ce03e415f45c2937d953a8602193e7f6c68a1;hp=f77ebcd1c8d61f5b5f7c5b78268c1743ac0f8448;hb=b829b61f516298a0de3907cd4c30aef189dd8dd4;hpb=30a64ad83ffc0e815cb135b0587ebf5a1f9af081

diff --git a/audiod.h b/audiod.h
index f77ebcd1..077ce03e 100644
--- a/audiod.h
+++ b/audiod.h
@@ -54,18 +54,15 @@ struct audiod_task {
  * \sa struct task, struct sched
  */
 struct status_task {
-	/** the output of the stat command is read from this fd */
-	int fd;
-	/** stat data is stored here */
-	char buf[STRINGSIZE];
-	/** number of bytes loaded in \a buf */
-	unsigned loaded;
+	/** the associated task structure of audiod */
+	struct task task;
+	struct private_client_data *pcd;
 	/** the array of status items sent by para_server */
 	char *stat_item_values[NUM_STAT_ITEMS];
-	/** the associated task structure */
-	struct task task;
 	/** 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 */
@@ -76,21 +73,20 @@ struct status_task {
 	struct timeval sa_time_diff;
 	/** whether client time is ahead of server time */
 	int sa_time_diff_sign;
-	/** the audio format announced in server status */
-	char *af_status;
 	/** non-zero if \a af_status is "playing" */
 	int playing;
 };
 
 extern struct status_task *stat_task;
 extern struct slot_info slot[MAX_STREAM_SLOTS];
-extern struct gengetopt_args_info conf;
+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);
 
 /** iterate over all slots */
 #define FOR_EACH_SLOT(_slot) for (_slot = 0; _slot < MAX_STREAM_SLOTS; _slot++)