gui: fix command abort

[paraslash.git] / audiod.h

diff --git a/audiod.h b/audiod.h
index 7e2e2769985f08efcf3227db068e2d7b155ab564..077ce03e415f45c2937d953a8602193e7f6c68a1 100644 (file)
--- a/audiod.h
+++ b/audiod.h
@@ -37,6 +37,7 @@ struct slot_info {
        /** the active writer node group */
        struct writer_node_group *wng;
 };
+
 /**
  * the main task of audiod
  *
@@ -46,39 +47,46 @@ struct audiod_task {
        struct timeval *now;
        struct task task;
 };
+
 /**
  * the task for audiod's child (para_client stat)
  *
  * \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 */
+       /** 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];
        /** do not restart client command until this time */
        struct timeval restart_barrier;
-       int playing;
+       /** 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;
-       int sa_time_diff_sign;
-       char *stat_item_values[NUM_STAT_ITEMS];
+       /** the start of the current stream from the view of para_server */
        struct timeval server_stream_start;
+       /** the averaged 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 \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++)