From 6c871994f08bb6e20374a67f7b07de97b8042434 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Sun, 31 Mar 2013 22:44:38 +0000 Subject: [PATCH] wav filter: Switch to the alternative post select method. --- wav_filter.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/wav_filter.c b/wav_filter.c index 716d8dd9..ccf923e9 100644 --- a/wav_filter.c +++ b/wav_filter.c @@ -74,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; @@ -83,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) { @@ -113,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(&fn->btrn); PARA_ERROR_LOG("%s\n", para_strerror(-ret)); } + return ret; } /** @@ -132,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; } -- 2.30.2