Merge branch 't/dia'

[paraslash.git] / opusdec_filter.c

diff --git a/opusdec_filter.c b/opusdec_filter.c
index 482108a6c98df3e7f4891ea52fa81f3405353064..90e65bc369571fbf9e8cde134efc07a17b76e124 100644 (file)
--- a/opusdec_filter.c
+++ b/opusdec_filter.c
@@ -35,6 +35,12 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+
+/* Silence gcc warning caused by including opus.h */
+#if !defined(__STDC_VERSION__)
+#define __STDC_VERSION__ 0
+#endif
+
 #include <regex.h>
 #include <opus/opus.h>
 #include <opus/opus_multistream.h>
@@ -198,18 +204,6 @@ static int decode_packet(struct opusdec_context *ctx, ogg_packet *op,
        return 1;
 }
 
-static void opusdec_pre_select(struct sched *s, struct task *t)
-{
-       struct filter_node *fn = container_of(t, struct filter_node, task);
-       struct btr_node *btrn = fn->btrn;
-       int ns;
-
-       ns = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
-       if (ns != 0)
-               return sched_min_delay(s);
-       sched_request_timeout_ms(100, s);
-}
-
 static int opusdec_post_select(__a_unused struct sched *s, struct task *t)
 {
        struct filter_node *fn = container_of(t, struct filter_node, task);
@@ -276,7 +270,6 @@ void opusdec_filter_init(struct filter *f)
        f->open = opusdec_open;
        f->close = opusdec_close;
        f->pre_select = generic_filter_pre_select;
-       f->pre_select = opusdec_pre_select;
        f->post_select = opusdec_post_select;
        f->execute = opusdec_execute;
 }