X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.c;h=98cd3557e0f3e7a60b0019a309cfe61d63fa5824;hp=62caf09757ec52d45f825698d7f4656696d7bcff;hb=870fcd0379ab096184f42481541d668694da7c83;hpb=fb26e35b38544d4bb90fb80c6b4f68d9a76842c8

diff --git a/write.c b/write.c
index 62caf097..98cd3557 100644
--- a/write.c
+++ b/write.c
@@ -8,7 +8,9 @@
 
 #include <regex.h>
 #include <sys/types.h>
+#include <lopsub.h>
 
+#include "write_cmd.lsg.h"
 #include "para.h"
 #include "string.h"
 #include "write.cmdline.h"
@@ -18,7 +20,6 @@
 #include "stdin.h"
 #include "buffer_tree.h"
 #include "write.h"
-#include "write_common.h"
 #include "fd.h"
 #include "error.h"
 #include "version.h"
@@ -40,37 +41,10 @@ __noreturn static void print_help_and_die(void)
 	bool d = conf.detailed_help_given;
 
 	ggo_print_help(&h, d? GPH_STANDARD_FLAGS_DETAILED : GPH_STANDARD_FLAGS);
-	print_writer_helps(d? GPH_MODULE_FLAGS_DETAILED : GPH_MODULE_FLAGS);
+	print_writer_helps(d);
 	exit(0);
 }
 
-/*
- * Parse config and register a task for a writer node.
- *
- * \param arg Command line arguments.
- * \param parent The new node will be a child of \a parent.
- * \param wn The writer node.
- *
- * If arg is \p NULL, the OS-dependent default writer is used with no
- * arguments.  The default writers are alsa for Linux, osx for OS X, oss for
- * *BSD, and the file writer if the default writer is not supported.
- *
- * Once the writer configuration has been retrieved from the ->parse_config
- * callback a writer node is created, its buffer tree node is added to the
- * buffer tree as a child of the given parent.
- *
- * Finally, the new writer node's task structure is initialized and registered
- * to the paraslash scheduler.
- *
- * \return Standard.
- */
-static void setup_writer_node(const char *arg, struct btr_node *parent,
-		struct writer_node *wn, struct sched *s)
-{
-	wn->conf = check_writer_arg_or_die(arg, &wn->writer_num);
-	register_writer_node(wn, parent, s);
-}
-
 struct write_task {
 	struct task *task;
 	struct check_wav_context *cwc;
@@ -90,7 +64,7 @@ static int write_post_select(__a_unused struct sched *s, void *context)
 
 static int setup_and_schedule(void)
 {
-	int i, ret;
+	int i, n, ret;
 	struct btr_node *cw_btrn;
 	struct writer_node *wns;
 	static struct sched s;
@@ -109,28 +83,25 @@ static int setup_and_schedule(void)
 		.post_select = write_post_select,
 		.context = &wt,
 	}, &s);
-	if (!conf.writer_given) {
-		wns = para_calloc(sizeof(*wns));
-		setup_writer_node(NULL, cw_btrn, wns, &s);
-		i = 1;
-	} else {
-		wns = para_calloc(conf.writer_given * sizeof(*wns));
-		for (i = 0; i < conf.writer_given; i++)
-			setup_writer_node(conf.writer_arg[i], cw_btrn,
-				wns + i, &s);
-	}
 
+	n = conf.writer_given > 0? conf.writer_given : 1;
+	wns = para_calloc(n * sizeof(*wns));
+	for (i = 0; i < n; i++) {
+		char *arg = i < conf.writer_given?  conf.writer_arg[i] : NULL;
+		wns[i].wid = check_writer_arg_or_die(arg, &wns[i].lpr);
+		register_writer_node(wns + i, cw_btrn, &s);
+	}
 	s.default_timeout.tv_sec = 10;
 	s.default_timeout.tv_usec = 50000;
 	ret = schedule(&s);
 	if (ret >= 0) {
 		int j, ts;
-		for (j = 0; j < i; j++) {
+		for (j = 0; j < n; j++) {
 			struct writer_node *wn = wns + j;
 			ts = task_status(wn->task);
 			assert(ts < 0);
 			if (ts != -E_WRITE_COMMON_EOF && ts != -E_BTR_EOF) {
-				const char *name = writer_names[wn->writer_num];
+				const char *name = writer_name(wn->wid);
 				PARA_ERROR_LOG("%s: %s\n", name,
 					para_strerror(-ts));
 				if (ret >= 0)
@@ -138,14 +109,12 @@ static int setup_and_schedule(void)
 			}
 		}
 	}
-	for (i--; i >= 0; i--) {
+	for (i = n - 1; i >= 0; i--) {
 		struct writer_node *wn = wns + i;
-		struct writer *w = writers + wn->writer_num;
-
-		w->close(wn);
+		writer_get(wn->wid)->close(wn);
 		btr_remove_node(&wn->btrn);
-		w->free_config(wn->conf);
-		free(wn->conf);
+		lls_free_parse_result(wns[i].lpr,
+			lls_cmd(wn->wid, write_cmd_suite));
 	}
 	free(wns);
 	check_wav_shutdown(wt.cwc);
@@ -170,7 +139,6 @@ int main(int argc, char *argv[])
 
 	write_cmdline_parser(argc, argv, &conf);
 	loglevel = get_loglevel_by_name(conf.loglevel_arg);
-	writer_init();
 	version_handle_flag("write", conf.version_given);
 	if (conf.help_given || conf.detailed_help_given)
 		print_help_and_die();