filter.h: Kill some unused fields of struct filter_node.

[paraslash.git] / audiod.c

diff --git a/audiod.c b/audiod.c
index 322ce3be64a3ccc1030b1c7de0018805813ebcc9..128f7b424828c4c1b5966912d32a931427accc51 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -368,7 +368,7 @@ static void close_writers(struct slot_info *s)
        s->wns = NULL;
 }
 
-static void _close_filters(struct slot_info *s)
+static void close_filters(struct slot_info *s)
 {
        int i;
        struct audio_format_info *a = afi + s->format;
@@ -376,9 +376,13 @@ static void _close_filters(struct slot_info *s)
                return;
        for (i = 0; i < a->num_filters; i++) {
                struct filter_node *fn = s->fns + i;
-               struct filter *f = filters + fn->filter_num;
+               struct filter *f;
 
-               f->close(fn);
+               if (!fn)
+                       continue;
+               f = filters + fn->filter_num;
+               if (f->close)
+                       f->close(fn);
                btr_free_node(fn->btrn);
        }
        free(s->fns);
@@ -597,12 +601,14 @@ static int open_current_receiver(struct sched *s)
                 * this period begins to avoid restarting the receiver that
                 * belongs to the file just completed.
                 */
-               if (stat_task->server_stream_start.tv_sec != 0)
+               if (stat_task->server_stream_start.tv_sec != 0) {
                        sched_request_timeout_ms(100, s);
+                       return -1;
+               }
        }
        if (tv_diff(now, &afi[cafn].restart_barrier, &diff) < 0) {
                if (tv_diff(&s->timeout, &diff, NULL) > 0)
-                       s->timeout = diff;
+                       sched_request_timeout(&diff, s);
                else
                        sched_min_delay(s);
                return -1;
@@ -1056,12 +1062,17 @@ static bool try_to_close_slot(int slot_num)
        for (i = 0; i < a->num_filters; i++)
                if (s->fns && s->fns[i].task.error != -E_TASK_UNREGISTERED)
                        return false;
-       for (i = 0; i < a->num_writers; i++)
-               if (s->wns && s->wns[i].task.error != -E_TASK_UNREGISTERED)
+       if (a->num_writers > 0) {
+               for (i = 0; i < a->num_writers; i++)
+                       if (s->wns && s->wns[i].task.error != -E_TASK_UNREGISTERED)
+                               return false;
+       } else {
+               if (s->wns && s->wns[0].task.error != -E_TASK_UNREGISTERED)
                        return false;
+       }
        PARA_INFO_LOG("closing slot %d\n", slot_num);
        close_writers(s);
-       _close_filters(s);
+       close_filters(s);
        close_receiver(slot_num);
        clear_slot(slot_num);
        return true;