From 4d3f9f6c22281f9abb5d59d378a10303420641b7 Mon Sep 17 00:00:00 2001
From: Andre Noll <maan@systemlinux.org>
Date: Mon, 9 Mar 2009 22:35:11 +0100
Subject: [PATCH 1/1] Move struct status_task from audiod.h to audiod.c.

It's only used in audiod.c.
---
 audiod.c | 33 +++++++++++++++++++++++++++++++++
 audiod.h | 34 ----------------------------------
 2 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/audiod.c b/audiod.c
index e3fd49d3..3194501b 100644
--- a/audiod.c
+++ b/audiod.c
@@ -66,6 +66,39 @@ struct audio_format_info {
  * */
 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};
diff --git a/audiod.h b/audiod.h
index 5bd41c4f..74d598cf 100644
--- a/audiod.h
+++ b/audiod.h
@@ -67,40 +67,6 @@ struct slot_info {
 	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;
-- 
2.30.2