Move struct status_task from audiod.h to audiod.c.

It's only used in audiod.c.

diff --git a/audiod.c b/audiod.c
index e3fd49d3ba3666c29efd1bcbf0d43fa7089e9de0..3194501bfc7e6e0a5e687842be70a57cb84e76b2 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -66,6 +66,39 @@ struct audio_format_info {
  * */
 struct slot_info slot[MAX_STREAM_SLOTS];
 
  * */
 struct slot_info slot[MAX_STREAM_SLOTS];
 

+/**
+ * The task for obtaining para_server's status (para_client stat).
+ *
+ * \sa struct task, struct sched.
+ */
+struct status_task {
+       /** The associated task structure of audiod. */
+       struct task task;
+       /** Client data associated with the stat task. */
+       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. */
+       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;
+       /** The start of the current stream from the view of para_server. */
+       struct timeval server_stream_start;
+       /** The average 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 para_server's status is "playing". */
+       int playing;
+       /** Number of times the clock difference is to be checked. */
+       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;
+};

 
 /** The array of status items sent by para_server. */
 char *stat_item_values[NUM_STAT_ITEMS] = {NULL};
 
 /** The array of status items sent by para_server. */
 char *stat_item_values[NUM_STAT_ITEMS] = {NULL};

diff --git a/audiod.h b/audiod.h
index 5bd41c4fa00f52f3b6b24d4508967ecd707d418d..74d598cf4004678b9cb05db1e930a4099d29eb4a 100644 (file)
--- a/audiod.h
+++ b/audiod.h
@@ -67,40 +67,6 @@ struct slot_info {
        struct writer_node_group *wng;
 };
 
        struct writer_node_group *wng;
 };
 

-/**
- * the task for obtaining para_server's status (para_client stat)
- *
- * \sa struct task, struct sched
- */
-struct status_task {
-       /** the associated task structure of audiod */
-       struct task task;
-       /** client data associated with the stat task */
-       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 */
-       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;
-       /** the start of the current stream from the view of para_server */
-       struct timeval server_stream_start;
-       /** the average 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 para_server's status is "playing" */
-       int playing;
-       /** number of times the clock difference is to be checked */
-       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 slot_info slot[MAX_STREAM_SLOTS];
 extern struct audiod_args_info conf;
 extern int audiod_status;
 extern struct slot_info slot[MAX_STREAM_SLOTS];
 extern struct audiod_args_info conf;
 extern int audiod_status;