get rid of init_shed()

[paraslash.git] / audiod.h

diff --git a/audiod.h b/audiod.h
index 7e2e2769985f08efcf3227db068e2d7b155ab564..f77ebcd1c8d61f5b5f7c5b78268c1743ac0f8448 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 active writer node group */
        struct writer_node_group *wng;
 };

+

 /**
  * the main task of audiod
  *
 /**
  * the main task of audiod
  *


@@ -46,6 +47,7 @@ struct audiod_task {
        struct timeval *now;
        struct task task;
 };
        struct timeval *now;
        struct task task;
 };

+

 /**
  * the task for audiod's child (para_client stat)
  *
 /**
  * the task for audiod's child (para_client stat)
  *


@@ -58,18 +60,28 @@ struct status_task {
        char buf[STRINGSIZE];
        /** number of bytes loaded in \a buf */
        unsigned loaded;
        char buf[STRINGSIZE];
        /** number of bytes loaded in \a buf */
        unsigned loaded;

+       /** 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 associated task structure */
        struct task task;
        /** do not restart client command until this time */
        struct timeval restart_barrier;

-       int playing;
+       /** the offset value announced by para_server */

        int offset_seconds;
        int offset_seconds;

+       /** the length of the current audio file as announced by para_server */

        int length_seconds;
        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;
        struct timeval server_stream_start;

+       /** the averaged time deviation between para_server and para_audiod */

        struct timeval sa_time_diff;
        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 status_task *stat_task;
 extern struct slot_info slot[MAX_STREAM_SLOTS];
 extern struct gengetopt_args_info conf;