X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.h;h=da6f1e75aabfe2ceac26e9d4c7074e243b9829c9;hp=8816be7314bcd14516afc4e91226f3f3124df6c1;hb=00837775857a5c40c8c8da8ac509c3e751312ea3;hpb=2ce63f32adf9c47d6ed9604f3cd090229409df05

diff --git a/write.h b/write.h
index 8816be73..da6f1e75 100644
--- a/write.h
+++ b/write.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2010 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -17,12 +17,11 @@ struct writer_node {
 	int writer_num;
 	/** Writer-specific data. */
 	void *private_data;
-	/** Pointer to the group this node belongs to. */
-	struct writer_node_group *wng;
 	/** The writer-specific configuration of this node. */
 	void *conf;
-	/** How much of the wng's buffer is already written. */
-	size_t written;
+	struct btr_node *btrn;
+	struct task task;
+	size_t min_iqs;
 };
 
 /** Describes one supported writer. */
@@ -37,39 +36,43 @@ struct writer {
 	/**
 	 * The command line parser of the writer.
 	 *
-	 * It should check whether the command line options given by \a options are
-	 * valid.  On success, it should return a pointer to the writer-specific
-	 * configuration data determined by \a options.  Note that this might be called
-	 * more than once with different values of \a options.
+	 * 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().
 	 */
-	void *(*parse_config)(const char *options);
+	void *(*parse_config_or_die)(const char *options);
+	/**
+	 * Dellocate 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.
 	 *
-	 * This function should perform any work necessary to write the incoming
-	 * stream. To this aim, it may allocate its private data structure and store
-	 * a pointer to that structure via the given writer_node parameter.
+	 * 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.
 	 */
-	int (*open)(struct writer_node *);
+	void (*open)(struct writer_node *);
 	/**
 	 * Prepare the fd sets for select.
 	 *
-	 * This is called from the writer node group task's pre_select(). It
-	 * may use the sched pointer to add any file descriptors or to decrease
-	 * the select timeout. It must return positive on success and negative
-	 * on errors.
+	 * This is called from scheduler. It may use the sched pointer to add
+	 * any file descriptors or to decrease the select timeout.
 	 */
-	int (*pre_select)(struct sched *s, struct writer_node *wn);
+	void (*pre_select)(struct sched *s, struct task *t);
 	/**
 	 * Write audio data.
 	 *
-	 * Called from the post_select function of the wng task. It must keep
-	 * track of the number of bytes consumed from the wng's buffer via
-	 * the \p wn->written variable (which may be modified by the wng handling
-	 * functions). This function must return positive on success and
-	 * negative on errors.
+	 * Called from the post_select function of the writer node's task.
 	 */
-	int (*post_select)(struct sched *s, struct writer_node *wn);
+	void (*post_select)(struct sched *s, struct task *t);
 	/**
 	 * Close one instance of the writer.
 	 *
@@ -83,36 +86,9 @@ struct writer {
 	 */
 	void (*shutdown)(struct writer_node *);
 	struct ggo_help help;
+	btr_command_handler execute;
 };
 
-/**
- * Describes a set of writer nodes that all write the same stream.
- */
-struct writer_node_group {
-	/** Number of nodes belonging to this group. */
-	unsigned num_writers;
-	/** Array of pointers to the corresponding writer nodes. */
-	struct writer_node *writer_nodes;
-	/** Non-zero if an error or end of file was encountered by the feeding task. */
-	int *input_error;
-	/** Current output buffer. */
-	char **bufp;
-	/** Number of bytes loaded in the output buffer. */
-	size_t *loaded;
-	/** Number of audio channels of the current stream. */
-	unsigned int *channels;
-	/** Sample rate of the current stream. */
-	unsigned int *samplerate;
-	/** The task associated to this group. */
-	struct task task;
-	/** Whether the group is open, i.e. wng_open() was called. */
-	int open;
-	/** Max number of bytes written in the previous post_select() call. */
-	int last_written;
-};
-
-/** Loop over each writer node in a writer group. */
-#define FOR_EACH_WRITER_NODE(i, wng) for (i = 0; i < (wng)->num_writers; i++)
 /** Loop over each supported writer. */
 #define FOR_EACH_WRITER(i) for (i = 0; i < NUM_SUPPORTED_WRITERS; i++)