X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=flacdec_filter.c;h=6a3a8effaf83b3b9e333e429762f0ff2d3938afe;hp=bf881725165f38415267193473f56bc145dc2b5c;hb=da13797a119f8ce621a67145ca1c7acb8d338a3c;hpb=6da1cac0d9094a0f1869c95f0a65bc49b17544f6

diff --git a/flacdec_filter.c b/flacdec_filter.c
index bf881725..6a3a8eff 100644
--- a/flacdec_filter.c
+++ b/flacdec_filter.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2011-2013 Andre Noll <maan@systemlinux.org>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2011 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file flacdec_filter.c The flac decoder. */
 
@@ -12,7 +8,6 @@
 #include "para.h"
 #include "list.h"
 #include "sched.h"
-#include "ggo.h"
 #include "buffer_tree.h"
 #include "filter.h"
 #include "error.h"
@@ -210,9 +205,9 @@ static bool output_queue_full(struct btr_node *btrn)
 	return btr_get_output_queue_size(btrn) > FLACDEC_MAX_OUTPUT_SIZE;
 }
 
-static void flacdec_pre_select(struct sched *s, struct task *t)
+static void flacdec_pre_select(struct sched *s, void *context)
 {
-	struct filter_node *fn = container_of(t, struct filter_node, task);
+	struct filter_node *fn = context;
 	struct private_flacdec_data *pfd = fn->private_data;
 	struct btr_node *btrn = fn->btrn;
 	int ret;
@@ -226,9 +221,9 @@ static void flacdec_pre_select(struct sched *s, struct task *t)
 		return sched_min_delay(s);
 }
 
-static int flacdec_post_select(__a_unused struct sched *s, struct task *t)
+static int flacdec_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 private_flacdec_data *pfd = fn->private_data;
 	struct btr_node *btrn = fn->btrn;
 	int ret;
@@ -296,18 +291,10 @@ static void flacdec_open(struct filter_node *fn)
 	fn->min_iqs = 0;
 }
 
-/**
- * The init function of the flacdec filter.
- *
- * \param f Pointer to the filter struct to initialize.
- *
- * \sa filter::init.
- */
-void flacdec_filter_init(struct filter *f)
-{
-	f->open = flacdec_open;
-	f->close = flacdec_close;
-	f->pre_select = flacdec_pre_select;
-	f->post_select = flacdec_post_select;
-	f->execute = flacdec_execute;
-}
+const struct filter lsg_filter_cmd_com_flacdec_user_data = {
+	.open = flacdec_open,
+	.close = flacdec_close,
+	.pre_select = flacdec_pre_select,
+	.post_select = flacdec_post_select,
+	.execute = flacdec_execute,
+};