Merge branch 't/wma_improvements'

[paraslash.git] / audiod.c

diff --git a/audiod.c b/audiod.c
index 112f632de8c1f23cfdd893ae03fdb5c9e6a89d00..93bc8da37c6e8cf16f550b9e88b8c6f2c0c5ef95 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -77,6 +77,12 @@ enum vss_status_flags {
        VSS_STATUS_FLAG_PLAYING = 2,
 };
 
+/**
+ * The scheduler instance of para_audiod.
+ *
+ * This is needed also in audiod_command.c (for the tasks command), so it can
+ * not be made static.
+ */
 struct sched sched = {.max_fileno = 0};
 
 /**
@@ -244,7 +250,7 @@ char *get_time_string(int slot_num)
         */
        length = stat_task->length_seconds;
        tmp = &stat_task->server_stream_start;
-       if (s && s->wns) { /* writer active in this slot */
+       if (s && s->wns && s->wns[0].btrn) { /* writer active in this slot */
                btr_get_node_start(s->wns[0].btrn, &wstime);
                if (wstime.tv_sec != 0) { /* writer wrote something */
                        if (s->server_stream_start.tv_sec == 0) {
@@ -261,7 +267,7 @@ char *get_time_string(int slot_num)
                tv_diff(tmp, &stat_task->sa_time_diff, &sss);
        else
                tv_add(tmp, &stat_task->sa_time_diff, &sss);
-       if (!s || !s->wns) {
+       if (!s || !s->wns || !s->wns[0].btrn) {
                struct timeval diff;
                tv_diff(now, &sss, &diff);
                seconds = diff.tv_sec + stat_task->offset_seconds;
@@ -270,11 +276,14 @@ char *get_time_string(int slot_num)
        tv_diff(now, &wstime, &wtime);
        //PARA_CRIT_LOG("offset %d\n", s->offset_seconds);
        seconds = s->offset_seconds;
-       btr_get_node_start(s->receiver_node->btrn, &rstime);
-       ret = tv_diff(&rstime, &sss, &rskip);
-       if (ret > 0) { /* audiod was started in the middle of the stream */
-               tv_add(&wtime, &rskip, &sum);
-               seconds += sum.tv_sec;
+       if (s->receiver_node->btrn) {
+               btr_get_node_start(s->receiver_node->btrn, &rstime);
+               ret = tv_diff(&rstime, &sss, &rskip);
+               if (ret > 0) { /* audiod was started in the middle of the stream */
+                       tv_add(&wtime, &rskip, &sum);
+                       seconds += sum.tv_sec;
+               } else
+                       seconds += wtime.tv_sec;
        } else
                seconds += wtime.tv_sec;
 out:
@@ -1190,8 +1199,6 @@ static void status_post_select(struct sched *s, struct task *t)
                        kill_btrn(st->ct->btrn, &st->ct->task, -E_AUDIOD_OFF);
                        goto out;
                }
-               if (st->ct->task.error >= 0)
-                       goto out;
                close_stat_pipe();
                st->clock_diff_count = conf.clock_diff_count_arg;
                goto out;
@@ -1201,8 +1208,6 @@ static void status_post_select(struct sched *s, struct task *t)
                size_t sz;
                int ret;
                if (st->ct->task.error < 0) {
-                       if (st->ct->task.error >= 0)
-                               goto out;
                        close_stat_pipe();
                        goto out;
                }