X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.h;h=c7c227eefb146db15160b70d8cb25618adb1f0b3;hp=da6f1e75aabfe2ceac26e9d4c7074e243b9829c9;hb=3f696a82bbb79cb07bfdb8e510bb4f3515570cec;hpb=d56a8447f418cf9046077e743772a416b6f7b826

diff --git a/write.h b/write.h
index da6f1e75..c7c227ee 100644
--- a/write.h
+++ b/write.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -19,8 +19,11 @@ struct writer_node {
 	void *private_data;
 	/** The writer-specific configuration of this node. */
 	void *conf;
+	/** The buffer tree node associated with this writer node. */
 	struct btr_node *btrn;
-	struct task task;
+	/** The task of this writer node. */
+	struct task *task;
+	/** The minimal input queue size (size of one audio sample). */
 	size_t min_iqs;
 };
 
@@ -36,56 +39,47 @@ struct writer {
 	/**
 	 * The command line parser of the writer.
 	 *
-	 * It should check whether the command line options given by \a options
-	 * are valid and return a pointer to the writer-specific configuration
-	 * data determined by \a options. This function must either succeed or
-	 * call exit(). Note that parse_config_or_die() might be called more
-	 * than once with different values of \a options. \sa \ref
-	 * free_config().
+	 * It should check whether the command line options given by \a argv
+	 * and \a argc are valid and return a pointer to the writer-specific
+	 * configuration data determined by these options. This function must
+	 * either succeed or call exit(). Note that parse_config_or_die() might
+	 * be called more than once with different values of \a options. \sa
+	 * \ref free_config().
 	 */
-	void *(*parse_config_or_die)(const char *options);
+	void *(*parse_config_or_die)(int argc, char **argv);
 	/**
-	 * Dellocate all configuration resources.
+	 * Deallocate all configuration resources.
 	 *
 	 * This should free whatever was allocated by \ref parse_config_or_die().
 	 */
 	void (*free_config)(void *config);
-	/**
-	 * Open one instance of this writer.
-	 *
-	 * Perform any preparations needed to write the incoming stream.
-	 * Usually this function just allocates its private data structure and
-	 * stores a pointer to that structure in the ->private data of the
-	 * given parameter. This function must either succeed or terminate the
-	 * process.
-	 */
-	void (*open)(struct writer_node *);
 	/**
 	 * Prepare the fd sets for select.
 	 *
 	 * This is called from scheduler. It may use the sched pointer to add
 	 * any file descriptors or to decrease the select timeout.
 	 */
-	void (*pre_select)(struct sched *s, struct task *t);
+	void (*pre_select)(struct sched *s, void *context);
 	/**
 	 * Write audio data.
 	 *
 	 * Called from the post_select function of the writer node's task.
 	 */
-	void (*post_select)(struct sched *s, struct task *t);
+	int (*post_select)(struct sched *s, void *context);
 	/**
 	 * Close one instance of the writer.
 	 *
 	 * This function is assumed to succeed.
 	 */
 	void (*close)(struct writer_node *);
+	/** The short and the log help text of this writer. */
+	struct ggo_help help;
 	/**
-	 * Shutdown the writer
+	 * The callback handler.
 	 *
-	 * This is a optional function pointer used for cleaning up.
+	 * Each writer may provide an ->execute callback which can be used for
+	 * inter-node communication.
 	 */
-	void (*shutdown)(struct writer_node *);
-	struct ggo_help help;
 	btr_command_handler execute;
 };