gui.c: Remove condition which is always true.
[paraslash.git] / aacdec_filter.c
index 71654bf37513b036331082100d9f0024d2c43c3e..ac8148e863d8568082dca4cb3aac68843e5893a6 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -80,9 +80,9 @@ static void aacdec_close(struct filter_node *fn)
        fn->private_data = NULL;
 }
 
-static int aacdec_post_select(__a_unused struct sched *s, struct task *t)
+static int aacdec_post_select(__a_unused struct sched *s, void *context)
 {
-       struct filter_node *fn = container_of(t, struct filter_node, task);
+       struct filter_node *fn = context;
        struct btr_node *btrn = fn->btrn;
        struct private_aacdec_data *padd = fn->private_data;
        int i, ret;
@@ -122,7 +122,7 @@ next_buffer:
                        ret = -E_AACDEC_INIT;
                        if (NeAACDecInit2(padd->handle, p,
                                        padd->decoder_length, &rate,
-                                       &channels) < 0)
+                                       &channels) != 0)
                                goto out;
                }
                padd->sample_rate = rate;
@@ -218,6 +218,6 @@ void aacdec_filter_init(struct filter *f)
        f->open = aacdec_open;
        f->close = aacdec_close;
        f->pre_select = generic_filter_pre_select;
-       f->new_post_select = aacdec_post_select;
+       f->post_select = aacdec_post_select;
        f->execute = aacdec_execute;
 }