Introduce the new nonblock API.

[paraslash.git] / audiod.c

diff --git a/audiod.c b/audiod.c
index 41fcdd8f1bc5e49ec49ff3d44369cdeb81ab4f19..380e53e0fbae30cf9c949afea6d247d71396eb37 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -92,6 +92,7 @@ struct status_task {
        struct timeval restart_barrier;
        /** Last time we received status data from para_server. */
        struct timeval last_status_read;
+       size_t min_iqs;
        /** The offset value announced by para_server. */
        int offset_seconds;
        /** The length of the current audio file as announced by para_server. */
@@ -347,7 +348,6 @@ static void close_receiver(int slot_num)
 {
        struct slot_info *s = &slot[slot_num];
        struct audio_format_info *a;
-       struct timeval restart_delay = {0, 200 * 1000};
 
        if (s->format < 0 || !s->receiver_node)
                return;
@@ -358,7 +358,6 @@ static void close_receiver(int slot_num)
        btr_free_node(s->receiver_node->btrn);
        free(s->receiver_node);
        s->receiver_node = NULL;
-       tv_add(now, &restart_delay, &afi[s->format].restart_barrier);
 }
 
 static void writer_cleanup(struct writer_node *wn)
@@ -577,22 +576,23 @@ static int open_receiver(int format)
        return slot_num;
 }
 
-/* return: 0: Not running, 1: Running, -1: Running but eof (or error) */
-static int receiver_running(int format)
+static bool receiver_running(void)
 {
-       int i, ret = 0;
+       int i;
+       long unsigned ss1 = stat_task->server_stream_start.tv_sec;
 
        FOR_EACH_SLOT(i) {
                struct slot_info *s = &slot[i];
-               if (s->format != format)
-                       continue;
+               long unsigned ss2 = s->server_stream_start.tv_sec;
+
                if (!s->receiver_node)
                        continue;
                if (s->receiver_node->task.error >= 0)
-                       return 1;
-               ret = -1;
+                       return true;
+               if (ss1 == ss2)
+                       return true;
        }
-       return ret;
+       return false;
 }
 
 /**
@@ -630,15 +630,20 @@ struct btr_node *audiod_get_btr_root(void)
 /* whether a new instance of a decoder should be started. */
 static bool must_start_decoder(void)
 {
-       int ret, cafn = stat_task->current_audio_format_num;
+       int cafn = stat_task->current_audio_format_num;
+       unsigned vs = stat_task->vss_status;
 
-       if (cafn < 0 || !stat_task->ct)
+       if (audiod_status != AUDIOD_ON)
+               return false;
+       if (cafn < 0)
                return false;
-       /* Do nothing if the 'N' flag is set or the 'P' flag is unset */
-       if (stat_task->vss_status != VSS_STATUS_FLAG_PLAYING)
+       if (!stat_task->ct)
                return false;
-       ret = receiver_running(cafn);
-       if (ret != 0) /* already running */
+       if (vs & VSS_STATUS_FLAG_NEXT)
+               return false;
+       if (!(vs & VSS_STATUS_FLAG_PLAYING))
+               return false;
+       if (receiver_running())
                return false;
        if (tv_diff(now, &afi[cafn].restart_barrier, NULL) < 0)
                return false;
@@ -1023,6 +1028,7 @@ static void command_post_select(struct sched *s, struct task *t)
        ret = handle_connect(ct->fd);
        if (ret < 0)
                PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+       audiod_status_dump();
 }
 
 static void init_command_task(struct command_task *ct)
@@ -1146,10 +1152,19 @@ static void status_pre_select(struct sched *s, struct task *t)
        ret = btr_node_status(st->btrn, 0, BTR_NT_LEAF);
        if (ret > 0)
                goto min_delay;
-       if (!st->ct)
+       if (st->ct && audiod_status == AUDIOD_OFF)
+               goto min_delay;
+       if (!st->ct && audiod_status != AUDIOD_OFF)
                sched_request_barrier_or_min_delay(&st->restart_barrier, s);
        if (cafn >= 0)
                sched_request_barrier(&afi[cafn].restart_barrier, s);
+       /*
+        * If para_server is playing we'd like to have a smooth time display
+        * even if we are running in standby mode. So we request a timeout that
+        * expires at the next full second.
+        */
+       if (stat_task->vss_status & VSS_STATUS_FLAG_PLAYING)
+               sched_request_timeout_ms(1000 - now->tv_usec / 1000, s);
        return;
 min_delay:
        sched_min_delay(s);
@@ -1185,25 +1200,28 @@ static void status_post_select(__a_unused struct sched *s, struct task *t)
                }
                if (st->ct->status != CL_RECEIVING)
                        goto out;
-               ret = btr_node_status(st->btrn, 0, BTR_NT_LEAF);
-               if (ret <= 0)
+               ret = btr_node_status(st->btrn, st->min_iqs, BTR_NT_LEAF);
+               if (ret <= 0) {
+                       struct timeval diff;
+                       tv_diff(now, &st->last_status_read, &diff);
+                       if (diff.tv_sec > 61)
+                               kill_btrn(st->ct->btrn, &st->ct->task,
+                                       -E_STATUS_TIMEOUT);
                        goto out;
+               }
+               btr_merge(st->btrn, st->min_iqs);
                sz = btr_next_buffer(st->btrn, &buf);
                ret = for_each_stat_item(buf, sz, update_item);
                if (ret < 0) {
                        kill_btrn(st->ct->btrn, &st->ct->task, ret);
                        goto out;
                }
-               if (sz != ret)
+               if (sz != ret) {
+                       btr_consume(st->btrn, sz - ret);
                        st->last_status_read = *now;
-               else {
-                       struct timeval diff;
-                       tv_diff(now, &st->last_status_read, &diff);
-                       if (diff.tv_sec > 61)
-                               kill_btrn(st->ct->btrn, &st->ct->task,
-                                       -E_STATUS_TIMEOUT);
-               }
-               btr_consume(st->btrn, sz - ret);
+                       st->min_iqs = 0;
+               } else /* current status item crosses buffers */
+                       st->min_iqs = sz + 1;
                goto out;
        }
        if (tv_diff(now, &st->restart_barrier, NULL) < 0)