/*
- * Copyright (C) 2009-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2009-2013 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
/** \file prebuffer_filter.c Paraslash's prebuffering filter. */
#include <regex.h>
-#include <stdbool.h>
#include "para.h"
#include "prebuffer_filter.cmdline.h"
struct prebuffer_filter_args_info *conf = ppd->conf;
struct timeval diff;
- t->error = 0;
if (iqs == 0)
return;
if (ppd->barrier.tv_sec == 0) {
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, struct task *t)
{
struct filter_node *fn = container_of(t, struct filter_node, task);
struct btr_node *btrn = fn->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));
+ struct prebuffer_filter_args_info *conf = para_calloc(sizeof(*conf));
int ret = -E_PREBUFFER_SYNTAX;
- 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;
}
static void prebuffer_free_config(void *conf)
{
- prebuffer_cmdline_parser_free(conf);
+ prebuffer_filter_cmdline_parser_free(conf);
}
/**
{
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);
}