X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=prebuffer_filter.c;h=6078da0757f885eec2fec0dcb9fbda88cb99f454;hp=548a8177a544d183c9cd49bc2ae2bc81f8ea7db2;hb=9bfd946422ec369c4fd91aa1c674cfb277e8cd9f;hpb=ffb2eaa90429f6d5c3d369509efcdf91c5463dad

diff --git a/prebuffer_filter.c b/prebuffer_filter.c
index 548a8177..6078da07 100644
--- a/prebuffer_filter.c
+++ b/prebuffer_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2009 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -7,7 +7,6 @@
 /** \file prebuffer_filter.c Paraslash's prebuffering filter. */
 
 #include <regex.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "prebuffer_filter.cmdline.h"
@@ -29,16 +28,15 @@ struct private_prebuffer_data {
 	struct timeval barrier;
 };
 
-static void prebuffer_pre_select(struct sched *s, struct task *t)
+static void prebuffer_pre_select(struct sched *s, void *context)
 {
-	struct filter_node *fn = container_of(t, struct filter_node, task);
+	struct filter_node *fn = context;
 	struct btr_node *btrn = fn->btrn;
 	size_t iqs = btr_get_input_queue_size(btrn);
 	struct private_prebuffer_data *ppd = fn->private_data;
 	struct prebuffer_filter_args_info *conf = ppd->conf;
 	struct timeval diff;
 
-	t->error = 0;
 	if (iqs == 0)
 		return;
 	if (ppd->barrier.tv_sec == 0) {
@@ -58,44 +56,41 @@ static void prebuffer_close(struct filter_node *fn)
 	free(fn->private_data);
 }
 
-static void prebuffer_post_select(__a_unused struct sched *s, struct task *t)
+static int prebuffer_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 btr_node *btrn = fn->btrn;
 	size_t iqs = btr_get_input_queue_size(btrn);
 	struct private_prebuffer_data *ppd = fn->private_data;
 	struct prebuffer_filter_args_info *conf = ppd->conf;
 
-	t->error = 0;
 	if (ppd->barrier.tv_sec == 0)
-		return;
+		return 0;
 	if (tv_diff(now, &ppd->barrier, NULL) < 0)
-		return;
+		return 0;
 	if (iqs < conf->size_arg)
-		return;
-	btr_splice_out_node(btrn);
-	t->error = -E_PREBUFFER_SUCCESS;
+		return 0;
+	btr_splice_out_node(&fn->btrn);
+	return -E_PREBUFFER_SUCCESS;
 }
 
 static int prebuffer_parse_config(int argc, char **argv, void **config)
 {
-	struct prebuffer_filter_args_info *prebuffer_conf
-		= para_calloc(sizeof(*prebuffer_conf));
-	int ret = -E_PREBUFFER_SYNTAX;
+	struct prebuffer_filter_args_info *conf = para_calloc(sizeof(*conf));
+	int ret;
 
-	if (prebuffer_cmdline_parser(argc, argv, prebuffer_conf))
-		goto err;
+	prebuffer_filter_cmdline_parser(argc, argv, conf);
 	ret = -ERRNO_TO_PARA_ERROR(EINVAL);
-	if (prebuffer_conf->duration_arg < 0)
+	if (conf->duration_arg < 0)
 		goto err;
-	if (prebuffer_conf->size_arg < 0)
+	if (conf->size_arg < 0)
 		goto err;
-	PARA_NOTICE_LOG("prebuffering %ims, %i bytes\n",
-		prebuffer_conf->duration_arg, prebuffer_conf->size_arg);
-	*config = prebuffer_conf;
+	PARA_NOTICE_LOG("prebuffering %ims, %i bytes\n", conf->duration_arg,
+		conf->size_arg);
+	*config = conf;
 	return 1;
 err:
-	free(prebuffer_conf);
+	free(conf);
 	return ret;
 }
 
@@ -109,7 +104,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);
 }
 
 /**
@@ -121,15 +116,12 @@ 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;
 	f->free_config = prebuffer_free_config;
 	f->pre_select = prebuffer_pre_select;
 	f->post_select = prebuffer_post_select;
-	f->help = (struct ggo_help) {
-		.short_help = prebuffer_filter_args_info_help,
-		.detailed_help = prebuffer_filter_args_info_detailed_help
-	};
+	f->help = (struct ggo_help)DEFINE_GGO_HELP(prebuffer_filter);
 }