X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3dec_filter.c;h=bcb1eca8dc563881ddc50065b1a2f4e0d18f1182;hp=a6fb2bd4f95aeb14feec9f7c0e80f3a619e073e1;hb=35e284e06a5c8e20d02b61fdcb4bcc20b237c1e4;hpb=d16fe3df649cb48d5ffa26187da3dad4c3066646

diff --git a/mp3dec_filter.c b/mp3dec_filter.c
index a6fb2bd4..bcb1eca8 100644
--- a/mp3dec_filter.c
+++ b/mp3dec_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -130,7 +130,7 @@ decode:
 		ret = handle_decode_error(pmd);
 		if (ret < 0)
 			goto err;
-		ret = mad_stream_sync(&pmd->stream);
+		mad_stream_sync(&pmd->stream);
 		if (pmd->stream.error == MAD_ERROR_BUFLEN) {
 			ret = -E_MP3DEC_EOF;
 			if (len == iqs && btr_no_parent(btrn))
@@ -166,7 +166,7 @@ decode:
 err:
 	assert(ret < 0);
 	t->error = ret;
-	btr_remove_node(btrn);
+	btr_remove_node(&fn->btrn);
 }
 
 static void mp3dec_open(struct filter_node *fn)
@@ -189,7 +189,7 @@ static int mp3dec_parse_config(int argc, char **argv, void **config)
 
 	mp3_conf = para_calloc(sizeof(*mp3_conf));
 	ret = -E_MP3DEC_SYNTAX;
-	if (mp3dec_cmdline_parser(argc, argv, mp3_conf))
+	if (mp3dec_filter_cmdline_parser(argc, argv, mp3_conf))
 		goto err;
 	*config = mp3_conf;
 	return 1;
@@ -208,7 +208,7 @@ static int mp3dec_execute(struct btr_node *btrn, const char *cmd, char **result)
 
 static void mp3dec_free_config(void *conf)
 {
-	mp3dec_cmdline_parser_free(conf);
+	mp3dec_filter_cmdline_parser_free(conf);
 }
 /**
  * The init function of the mp3dec filter.
@@ -221,7 +221,7 @@ void mp3dec_filter_init(struct filter *f)
 {
 	struct mp3dec_filter_args_info dummy;
 
-	mp3dec_cmdline_parser_init(&dummy);
+	mp3dec_filter_cmdline_parser_init(&dummy);
 	f->open = mp3dec_open;
 	f->close = mp3dec_close;
 	f->parse_config = mp3dec_parse_config;