X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.h;h=936d99c0a45cc1bcc166e97fbb4552d2545182ca;hp=7ecb091ba9d6d83e94d7d976a1e37941985360c6;hb=694d9ae83695e54ffbb51acb1db0496c4281f4b4;hpb=6bdac07456cb5872f824028912d1049883a9c21f

diff --git a/write.h b/write.h
index 7ecb091b..936d99c0 100644
--- a/write.h
+++ b/write.h
@@ -13,18 +13,15 @@ enum writer_enum {WRITER_ENUM};
  * Describes one running instance of a writer.
  */
 struct writer_node {
-	/** Points to the writer structure associated with this node. */
-	struct writer *writer; /* FIXME: Should better be only the number. */
+	/** The number of this writer. */
+	int writer_num;
 	/** Writer-specific data. */
 	void *private_data;
-	/** Send that many bytes in one go. */
-	int chunk_bytes;
-	/** 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. */
@@ -45,33 +42,28 @@ struct writer {
 	 * more than once with different values of \a options.
 	 */
 	void *(*parse_config)(const char *options);
+	void (*free_config)(void *conf);
 	/**
 	 * Open one instance of this writer.
 	 *
 	 * This function should perform any work necessary to write the incoming
-	 * stream. If To this aim, it may allocate its private data structure and store
+	 * stream. To this aim, it may allocate its private data structure and store
 	 * a pointer to that structure via the given writer_node parameter.
 	 */
 	int (*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.
 	 *
@@ -85,36 +77,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;
-	/** The maximum of the chunk_bytes values of the writer nodes in this group. */
-	int max_chunk_bytes;
-	/** Non-zero if an error or end of file was encountered by the feeding task. */
-	int *input_error;
-	/** Current output buffer. */
-	char *buf;
-	/** 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;
-};
-
-/** 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++)