X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=mp3dec_filter.c;h=2472b2cfa70b916d69b7d9c962aceb79050acd38;hb=c282c836791cedf57c128555af90af37c7c01c05;hp=1e074a7e8104075b2963a64beb55aa9c720590a4;hpb=74a835c7c3b6f4f71fc1f4739f26757dffdf012a;p=paraslash.git

diff --git a/mp3dec_filter.c b/mp3dec_filter.c
index 1e074a7e..2472b2cf 100644
--- a/mp3dec_filter.c
+++ b/mp3dec_filter.c
@@ -198,11 +198,12 @@ next_buffer:
 	iqs = btr_get_input_queue_size(btrn);
 	if (need_bad_data_delay(pmd, iqs))
 		return;
-	ret = prepare_filter_node(fn);
+	ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
 	if (ret < 0)
 		goto err;
 	if (ret == 0)
 		return;
+	btr_merge(btrn, fn->min_iqs);
 	len = btr_next_buffer(btrn, &inbuffer);
 	mad_stream_buffer(&pmd->stream, (unsigned char *)inbuffer, len);
 next_frame:
@@ -256,9 +257,8 @@ next_frame:
 	goto next_frame;
 err:
 	assert(ret < 0);
-	mp3dec_close(fn);
 	t->error = ret;
-	btr_del_node(btrn);
+	btr_remove_node(btrn);
 }
 
 static void mp3dec_open(struct filter_node *fn)
@@ -317,6 +317,11 @@ static int mp3dec_execute(struct btr_node *btrn, const char *cmd, char **result)
 	}
 	return -ERRNO_TO_PARA_ERROR(ENOTSUP);
 }
+
+static void mp3dec_free_config(void *conf)
+{
+	mp3dec_cmdline_parser_free(conf);
+}
 /**
  * The init function of the mp3dec filter.
  *
@@ -333,6 +338,7 @@ void mp3dec_filter_init(struct filter *f)
 	f->convert = mp3dec;
 	f->close = mp3dec_close;
 	f->parse_config = mp3dec_parse_config;
+	f->free_config = mp3dec_free_config;
 	f->pre_select = generic_filter_pre_select;
 	f->post_select = mp3dec_post_select;
 	f->execute = mp3dec_execute;