X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter.h;h=135a6887405e496ef7c44154886d449c1e3e8156;hp=f737645262b70af326aaf31de631532b9ca6ad64;hb=6fbd93c8420823356a24a3637d332c23c0c85dcd;hpb=9c00a79ed817c854ed10ee6bd1b908df8dc13a2f diff --git a/filter.h b/filter.h index f7376452..135a6887 100644 --- a/filter.h +++ b/filter.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2013 Andre Noll + * Copyright (C) 2005 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -27,7 +27,7 @@ struct filter_node { /** The buffer tree node. */ struct btr_node *btrn; /** The task corresponding to this filter node. */ - struct task task; + struct task *task; /** The minimal input queue size, see \ref btr_node_status(). */ size_t min_iqs; }; @@ -101,17 +101,14 @@ struct filter { * this function is to set file descriptors to be watched by the * subsequent select call to the two fd sets. */ - void (*pre_select)(struct sched *s, struct task *t); + void (*pre_select)(struct sched *s, void *context); /** * Convert (filter) the given data. * * Pointer to the converting function of the filter. On errors, the - * post_select function is supposed to set t->error to a (negative) - * error code. + * post_select function is supposed to return a negative error code. */ - void (*post_select)(struct sched *s, struct task *t); - /** New variant, see sched.h. */ - int (*new_post_select)(struct sched *s, struct task *t); + int (*post_select)(struct sched *s, void *context); /** * Answer a buffer tree query. * @@ -123,8 +120,8 @@ struct filter { void filter_init(void); int check_filter_arg(char *filter_arg, void **conf); -void print_filter_helps(int detailed); -void generic_filter_pre_select(struct sched *s, struct task *t); +void print_filter_helps(unsigned flags); +void generic_filter_pre_select(struct sched *s, void *context); int decoder_execute(const char *cmd, unsigned sample_rate, unsigned channels, char **result);