Merge branch 'master' into my-osx

[paraslash.git] / audiod.h

diff --git a/audiod.h b/audiod.h
index f77ebcd1c8d61f5b5f7c5b78268c1743ac0f8448..c8d5fc2ea704d19d77b3db50b399e7d28c0497f5 100644 (file)
--- a/audiod.h
+++ b/audiod.h
@@ -54,16 +54,11 @@ 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;
        /** the offset value announced by para_server */
@@ -84,7 +79,7 @@ struct status_task {
 
 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];