X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.h;h=1c4a65fceefe4651af47f7e1df2aa14f55484c9a;hp=cc24d359bbbb765c897ac880f483e95b65e0f8f4;hb=9337bed6e84a4068e750fb6597646b45778eeba7;hpb=a95093cd8b62d411b9448aa77768774e1bdd81e5

diff --git a/write.h b/write.h
index cc24d359..1c4a65fc 100644
--- a/write.h
+++ b/write.h
@@ -26,12 +26,11 @@ enum writer_enum {WRITER_ENUM};
  */
 struct writer_node {
 	/** points to the writer structure associated with this node */
-	struct writer *writer;
+	struct writer *writer; /* FIXME: Should better be only the number */
 	/** writer-specific data */
 	void *private_data;
 	/** send that many bytes in one go */
 	int chunk_bytes;
-	struct task task;
 	struct writer_node_group *wng;
 	/** the writer-specific configuration of this node */
 	void *conf;
@@ -39,60 +38,60 @@ struct writer_node {
 
 /** describes one supported writer */
 struct writer {
-/**
- * the init function of the writer
- *
- * It must fill in all other function pointers of the given
- * writer structure.
- *
- */
-void (*init)(struct writer *w);
-/**
- *
- *
- * 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.
- *
- */
-	void * (*parse_config)(char *options);
-/**
- *
- * 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
- * a pointer to that structure via the given writer_node paramenter.
- */
-int (*open)(struct writer_node *);
-/**
- *
- * write a chunk of audio data
- *
- * This is called from the driving application whenever a data block of \a
- * chunk_bytes is available. It must return the number of bytes consumed from
- * \a data on success, and negative on errors.
- *
- */
-int (*write)(char *data, size_t nbytes, struct writer_node *);
-void (*pre_select)(struct sched *s, struct task *t);
-void (*post_select)(struct sched *s, struct task *t);
-/**
- * close one instance of the writer
- *
- * This function is assumed to succeed.
- */
-void (*close)(struct writer_node *);
-/**
- * shutdown the writer
- *
- * This is a optional function pointer used for cleaning
- * up.
- */
-void (*shutdown)(struct writer_node *);
+	/**
+	 * the init function of the writer
+	 *
+	 * It must fill in all other function pointers of the given
+	 * writer structure.
+	 *
+	 */
+	void (*init)(struct writer *w);
+	/**
+	 *
+	 *
+	 * 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.
+	 *
+	 */
+		void * (*parse_config)(char *options);
+	/**
+	 *
+	 * 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
+	 * a pointer to that structure via the given writer_node paramenter.
+	 */
+	int (*open)(struct writer_node *);
+	/**
+	 *
+	 * write a chunk of audio data
+	 *
+	 * This is called from the driving application whenever a data block of \a
+	 * chunk_bytes is available. It must return the number of bytes consumed from
+	 * \a data on success, and negative on errors.
+	 *
+	 */
+	int (*write)(char *data, size_t nbytes, struct writer_node *);
+	int (*pre_select)(struct sched *s, struct writer_node *wn);
+	int (*post_select)(struct sched *s, struct writer_node *wn);
+	/**
+	 * close one instance of the writer
+	 *
+	 * This function is assumed to succeed.
+	 */
+	void (*close)(struct writer_node *);
+	/**
+	 * shutdown the writer
+	 *
+	 * This is a optional function pointer used for cleaning
+	 * up.
+	 */
+	void (*shutdown)(struct writer_node *);
 };
 
 /**