wav filter: Switch to the alternative post select method.

[paraslash.git] / wav_filter.c

diff --git a/wav_filter.c b/wav_filter.c
index 8408034d905c6f20eb375385d638de31a43df0e3..ccf923e97f160f8cadff6ddd3040468b37a5d145 100644 (file)
--- a/wav_filter.c
+++ b/wav_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -7,7 +7,6 @@
 /** \file wav_filter.c A filter that inserts a wave header. */
 
 #include <regex.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "error.h"
@@ -75,7 +74,7 @@ static void wav_pre_select(struct sched *s, struct task *t)
        sched_min_delay(s);
 }
 
-static void wav_post_select(__a_unused struct sched *s, struct task *t)
+static int wav_post_select(__a_unused struct sched *s, struct task *t)
 {
        struct filter_node *fn = container_of(t, struct filter_node, task);
        struct btr_node *btrn = fn->btrn;
@@ -84,12 +83,11 @@ static void wav_post_select(__a_unused struct sched *s, struct task *t)
        char *header, *buf;
        int32_t rate, ch;
 
-       t->error = 0;
        if (iqs == 0) {
                ret = -E_WAV_EOF;
                if (btr_no_parent(btrn))
                        goto err;
-               return;
+               return 0;
        }
        ret = btr_exec_up(btrn, "sample_rate", &buf);
        if (ret < 0) {
@@ -114,13 +112,13 @@ static void wav_post_select(__a_unused struct sched *s, struct task *t)
        btr_add_output(header, WAV_HEADER_LEN, btrn);
        ret = -E_WAV_SUCCESS;
 err:
-       t->error = ret;
        if (ret == -E_WAV_SUCCESS)
                btr_splice_out_node(btrn);
        else {
-               btr_remove_node(btrn);
+               btr_remove_node(&fn->btrn);
                PARA_ERROR_LOG("%s\n", para_strerror(-ret));
        }
+       return ret;
 }
 
 /**
@@ -133,5 +131,6 @@ void wav_filter_init(struct filter *f)
        f->close = wav_close;
        f->open = wav_open;
        f->pre_select = wav_pre_select;
-       f->post_select = wav_post_select;
+       f->new_post_select = wav_post_select;
+       f->post_select = NULL;
 }