X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.h;h=cb0beff812121b338e3749e80f63ad2cb99999db;hp=56a9711a44af6fde00ef23f6f5d203e407daf4d0;hb=7c19c1eab09b846325f20f49cf4d305e46917b83;hpb=1cefe6a503c74d609db4e99e689d46575a5e40fd

diff --git a/write.h b/write.h
index 56a9711a..cb0beff8 100644
--- a/write.h
+++ b/write.h
@@ -1,85 +1,46 @@
-/*
- * Copyright (C) 2006-2012 Andre Noll <maan@systemlinux.org>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file write.h Writer-related structures. */
 
-/** The list of supported writers. */
-enum writer_enum {WRITER_ENUM};
-
 /**
  * Describes one running instance of a writer.
  */
 struct writer_node {
-	/** The number of this writer. */
-	int writer_num;
+	/** The ID of this writer. */
+	int wid;
 	/** Writer-specific data. */
 	void *private_data;
-	/** The writer-specific configuration of this node. */
-	void *conf;
+	/** The parsed command line, merged with options given in the config file. */
+	struct lls_parse_result *lpr;
 	/** The buffer tree node associated with this writer node. */
 	struct btr_node *btrn;
 	/** The task of this writer node. */
-	struct task task;
+	struct task *task;
 	/** The minimal input queue size (size of one audio sample). */
 	size_t min_iqs;
 };
 
 /** 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 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_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);
 	/**
 	 * 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 *);
-	/**
-	 * Shutdown the writer.
-	 *
-	 * This is a optional function pointer used for cleaning up.
-	 */
-	void (*shutdown)(struct writer_node *);
-	/** The short and the log help text of this writer. */
-	struct ggo_help help;
 	/**
 	 * The callback handler.
 	 *
@@ -89,14 +50,23 @@ struct writer {
 	btr_command_handler execute;
 };
 
-/** Loop over each supported writer. */
-#define FOR_EACH_WRITER(i) for (i = 0; i < NUM_SUPPORTED_WRITERS; i++)
-
-/** Declare the init functions of all supported writers. */
-DECLARE_WRITER_INITS;
+#define WRITE_CMD(_num) (lls_cmd(_num, write_cmd_suite))
 
-/** Array containing the name of each writer. */
-extern const char *writer_names[];
+#define WRITE_CMD_OPT_RESULT(_cmd, _opt, _lpr) \
+	(lls_opt_result(LSG_WRITE_CMD_ ## _cmd ## _OPT_ ## _opt, _lpr))
+#define WRITE_CMD_OPT_GIVEN(_cmd, _opt, _lpr) \
+	(lls_opt_given(WRITE_CMD_OPT_RESULT(_cmd, _opt, _lpr)))
+#define WRITE_CMD_OPT_UINT32_VAL(_cmd, _opt, _lpr) \
+	(lls_uint32_val(0, WRITE_CMD_OPT_RESULT(_cmd, _opt, (_lpr))))
+#define WRITE_CMD_OPT_STRING_VAL(_cmd, _opt, _lpr) \
+	(lls_string_val(0, WRITE_CMD_OPT_RESULT(_cmd, _opt, (_lpr))))
 
-/** The writer structure for each supported writer. */
-extern struct writer writers[NUM_SUPPORTED_WRITERS];
+int check_writer_arg_or_die(const char *wa, struct lls_parse_result **lprp);
+const struct writer *writer_get(int wid);
+const char *writer_name(int wid);
+void register_writer_node(struct writer_node *wn, struct btr_node *parent,
+		struct sched *s);
+void get_btr_sample_rate(struct btr_node *btrn, int32_t *result);
+void get_btr_channels(struct btr_node *btrn, int32_t *result);
+void get_btr_sample_format(struct btr_node *btrn, int32_t *result);
+void print_writer_helps(bool detailed);