X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=flacdec_filter.c;h=d3a481cf07bf06988224a6efaeae8fac2995be62;hb=26a032fffa6c6e6f092ed3d14c2b5f08e5c736d6;hp=bbacb3dad87025073b5bf8e99dc1ea8fa6bf5800;hpb=642445e95fea1c548c79f80ad3b5d6f30ba572f3;p=paraslash.git

diff --git a/flacdec_filter.c b/flacdec_filter.c
index bbacb3da..d3a481cf 100644
--- a/flacdec_filter.c
+++ b/flacdec_filter.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2011 Andre Noll <maan@tuebingen.mpg.de>
- *
- * 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"
@@ -140,7 +135,7 @@ static FLAC__StreamDecoderWriteStatus write_cb(
 	struct btr_node *btrn = fn->btrn;
 	size_t k, n = frame->header.blocksize;
 	unsigned channels = FLAC__stream_decoder_get_channels(decoder);
-	char *outbuffer = para_malloc(n * channels * 2);
+	char *outbuffer = alloc(n * channels * 2);
 
 	if (channels == 1) {
 		for (k = 0; k < n; k++) {
@@ -291,23 +286,15 @@ static void flacdec_close(struct filter_node *fn)
 
 static void flacdec_open(struct filter_node *fn)
 {
-	struct private_flacdec_data *pfd = para_calloc(sizeof(*pfd));
+	struct private_flacdec_data *pfd = zalloc(sizeof(*pfd));
 	fn->private_data = pfd;
 	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,
+};