X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter.h;h=ab187df295b0c67024f5a5dcbf855ed49b06d6c4;hp=39cec9ba03f4cbee46497b43fda7bdebc7b63dbb;hb=1e012cf40238883621692051a22fb9c7cad5e944;hpb=d9e608504d9d0e71380907559546e211c4f0ce55

diff --git a/filter.h b/filter.h
index 39cec9ba..ab187df2 100644
--- a/filter.h
+++ b/filter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -32,6 +32,8 @@ struct filter_node {
 	struct list_head callbacks;
 	/** A pointer to the configuration of this instance. */
 	void *conf;
+	struct btr_node *btrn;
+	struct task task;
 };
 
 /** Describes one running instance of a chain of filters */
@@ -59,13 +61,13 @@ struct filter_chain {
 	 * buffer used to read from stdin for para_filter; the output buffer of the
 	 * current receiver for para_audiod).
 	 */
-	char *inbuf;
+	char **inbufp;
 	/**
 	 * The output buffer of the filter chain.
 	 *
 	 * Points to the output buffer of the last filter in the filter chain.
 	 */
-	char *outbuf;
+	char **outbufp;
 	/** Contains the number of bytes loaded in the input buffer. */
 	size_t *in_loaded;
 	/** Contains the number of bytes loaded in the output buffer. */
@@ -95,18 +97,10 @@ struct filter_chain {
 struct filter_callback {
 	/** All callbacks are organized in a doubly linked list. */
 	struct list_head node;
-	/**
-	 * Private data.
-	 *
-	 * May be initialized by the application before registering the callback. This
-	 * pointer is not used by the filter subsystem. It is provided for use within
-	 * the input/output/close callback functions.
-	 */
-	void *data;
 	/**
 	 * The input callback.
 	 *
-	 * In not \p NULL, the filter subsystem calls this function whenever the filter
+	 * If not \p NULL, the filter subsystem calls this function whenever the filter
 	 * consumed some or all of its input buffer. A pointer to the buffer of consumed
 	 * data, its length and a pointer to the own \a filter_callback structure are passed
 	 * to \a input_cb. The input callback is expected to return a negative value on errors.
@@ -183,13 +177,6 @@ struct filter {
 	 * by the open() function.
 	 */
 	void (*close)(struct filter_node *fn);
-	/**
-	 * Print the help text for this filter and exit.
-	 *
-	 * This is optional and it is not necessary to initialize this pointer if
-	 * the filter does not have a help text.
-	 */
-	void (*print_help)(void);
 	/**
 	 * A pointer to the filter's command line parser.
 	 *
@@ -203,13 +190,20 @@ struct filter {
 	 * argv. On failure, a negative paraslash error code must be returned.
 	 */
 	int (*parse_config)(int argc, char **argv, void **config);
+
+	/** The help texts for this filter. */
+	struct ggo_help help;
+
+	void (*pre_select)(struct sched *s, struct task *t);
+	void (*post_select)(struct sched *s, struct task *t);
+	btr_command_handler execute;
 };
 
 void close_filters(struct filter_chain *fc);
-void filter_init(struct filter *all_filters);
+void filter_init(void);
 int check_filter_arg(char *filter_arg, void **conf);
-void filter_pre_select(__a_unused struct sched *s, struct task *t);
-
+void filter_post_select(__a_unused struct sched *s, struct task *t);
+void print_filter_helps(int detailed);
 
 static inline void write_int16_host_endian(char *buf, int val)
 {