[btr] Split btr_del_node() into two functions.

[paraslash.git] / aacdec_filter.c

diff --git a/aacdec_filter.c b/aacdec_filter.c
index cb27633ca1a0cc411c5452deb82e94f886756cd4..602df63ef7bd91520f426cbe35ea85cc7ae91fe0 100644 (file)
--- a/aacdec_filter.c
+++ b/aacdec_filter.c
@@ -220,11 +220,12 @@ static void aacdec_post_select(__a_unused struct sched *s, struct task *t)
 
 next_buffer:
        t->error = 0;
-       ret = prepare_filter_node(fn);
+       ret = btr_node_status(btrn, fn->min_iqs);
        if (ret < 0)
                goto err;
        if (ret == 0)
                return;
+       btr_merge(btrn, fn->min_iqs);
        len = btr_next_buffer(btrn, (char **)&inbuf);
        iqs = btr_get_input_queue_size(btrn);
        if (!padd->initialized) {
@@ -325,9 +326,8 @@ out:
        }
 err:
        assert(ret < 0);
-       aacdec_close(fn);
        t->error = ret;
-       btr_del_node(btrn);
+       btr_remove_node(btrn);
 }
 
 /**