X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=prebuffer_filter.c;h=76ec7c73a411c292ebc62b2b9f857bd212562e60;hp=ac66b203c5526d75b52178a47383151d47a8f12d;hb=db2cd7b5404f5f01d25b72beacb3e5245b1bb94c;hpb=d9d83772fbee853857f1904fa6553f06a026108c diff --git a/prebuffer_filter.c b/prebuffer_filter.c index ac66b203..76ec7c73 100644 --- a/prebuffer_filter.c +++ b/prebuffer_filter.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 Andre Noll + * Copyright (C) 2009-2012 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -7,7 +7,6 @@ /** \file prebuffer_filter.c Paraslash's prebuffering filter. */ #include -#include #include "para.h" #include "prebuffer_filter.cmdline.h" @@ -74,7 +73,6 @@ static void prebuffer_post_select(__a_unused struct sched *s, struct task *t) if (iqs < conf->size_arg) return; btr_splice_out_node(btrn); - prebuffer_close(fn); t->error = -E_PREBUFFER_SUCCESS; } @@ -84,7 +82,7 @@ static int prebuffer_parse_config(int argc, char **argv, void **config) = para_calloc(sizeof(*prebuffer_conf)); int ret = -E_PREBUFFER_SYNTAX; - if (prebuffer_cmdline_parser(argc, argv, prebuffer_conf)) + if (prebuffer_filter_cmdline_parser(argc, argv, prebuffer_conf)) goto err; ret = -ERRNO_TO_PARA_ERROR(EINVAL); if (prebuffer_conf->duration_arg < 0) @@ -110,7 +108,7 @@ static void prebuffer_open(struct filter_node *fn) static void prebuffer_free_config(void *conf) { - prebuffer_cmdline_parser_free(conf); + prebuffer_filter_cmdline_parser_free(conf); } /** @@ -122,7 +120,7 @@ void prebuffer_filter_init(struct filter *f) { struct prebuffer_filter_args_info dummy; - prebuffer_cmdline_parser_init(&dummy); + prebuffer_filter_cmdline_parser_init(&dummy); f->open = prebuffer_open; f->close = prebuffer_close; f->parse_config = prebuffer_parse_config;