audiod: Change return value of open_current_receiver() to void.

[paraslash.git] / audiod.c

diff --git a/audiod.c b/audiod.c
index e3fd49d3ba3666c29efd1bcbf0d43fa7089e9de0..d771fa68b719edd33b228f94eec0d6b542bbb7be 100644 (file)
--- 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};
@@ -441,20 +474,20 @@ static int receiver_running(int format)
        return 0;
 }
 
-static int open_current_receiver(struct sched *s)
+static void open_current_receiver(struct sched *s)
 {
        struct timeval diff;
        int cafn = stat_task->current_audio_format_num;
 
        if (cafn < 0 || !stat_task->ct)
-               return 0;
+               return;
        if (receiver_running(cafn))
-               return 0;
+               return;
        if (tv_diff(now, &afi[cafn].restart_barrier, &diff) < 0) {
                s->timeout = diff;
-               return 0;
+               return;
        }
-       return open_receiver(cafn) < 0? 0 : 1;
+       open_receiver(cafn);
 }
 
 static unsigned compute_time_diff(const struct timeval *status_time)