alsa: Use new get_btr_* functions.

[paraslash.git] / oggdec_filter.c

diff --git a/oggdec_filter.c b/oggdec_filter.c
index ccc42559eceef7eb81c2fea1bd4d80c99b183eb7..956af85223a1e101fd9b290d84487fc74acae46a 100644 (file)
--- a/oggdec_filter.c
+++ b/oggdec_filter.c
@@ -191,11 +191,12 @@ static void ogg_post_select(__a_unused struct sched *s, struct task *t)
        char *in;
 
        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, &in);
        iqs = btr_get_input_queue_size(btrn);
        if (!pod->vf) {
@@ -259,9 +260,8 @@ static void ogg_post_select(__a_unused struct sched *s, struct task *t)
 
 err:
        assert(ret < 0);
-       ogg_close(fn);
        t->error = ret;
-       btr_del_node(btrn);
+       btr_remove_node(btrn);
 }
 
 static ssize_t ogg_convert(char *inbuffer, size_t len, struct filter_node *fn)