X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=aacdec_filter.c;h=cb27633ca1a0cc411c5452deb82e94f886756cd4;hb=fa2f988176a46dabc3adb4144a56f34f89ae6d1b;hp=80e49a0e0ed0661ffab921448cb9ea8b9fd5236e;hpb=7c70a152ffdbeae114ed71c4e7d10528198642bc;p=paraslash.git

diff --git a/aacdec_filter.c b/aacdec_filter.c
index 80e49a0e..cb27633c 100644
--- a/aacdec_filter.c
+++ b/aacdec_filter.c
@@ -58,22 +58,6 @@ struct private_aacdec_data {
 	unsigned int samplerate;
 };
 
-#define AACDEC_MAX_PENDING (640 * 1024)
-
-static void aacdec_pre_select(struct sched *s, struct task *t)
-{
-	struct filter_node *fn = container_of(t, struct filter_node, task);
-	size_t iqs = btr_get_input_queue_size(fn->btrn);
-
-	t->error = 0;
-	if (iqs == 0)
-		return;
-	if (btr_bytes_pending(fn->btrn) > AACDEC_MAX_PENDING)
-		return; /* FIXME, should use reasonable bound on timeout */
-	s->timeout.tv_sec = 0;
-	s->timeout.tv_usec = 1;
-}
-
 static ssize_t aacdec(char *input_buffer, size_t len, struct filter_node *fn)
 {
 	struct private_aacdec_data *padd = fn->private_data;
@@ -358,8 +342,7 @@ void aacdec_filter_init(struct filter *f)
 	f->open = aacdec_open;
 	f->convert = aacdec;
 	f->close = aacdec_close;
-	f->pre_select = aacdec_pre_select;
-	f->post_select = aacdec_post_select;
+	f->pre_select = generic_filter_pre_select;
 	f->post_select = aacdec_post_select;
 	f->execute = aacdec_execute;
 }