X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write_common.c;h=cdb67e58fd65bf4438522fd0bed4ef9092aaaeaf;hp=faf20749ba33062ed66845cafa38a283bcaa3c02;hb=9d8fdf8898418711558f70a9630b2444036d8285;hpb=ae8073c5441aeee5d3b63840e84d8c33e2c583ee;ds=sidebyside

diff --git a/write_common.c b/write_common.c
index faf20749..cdb67e58 100644
--- a/write_common.c
+++ b/write_common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -7,7 +7,6 @@
 /** \file write_common.c common functions of para_audiod and para_write */
 
 #include <regex.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "string.h"
@@ -17,6 +16,7 @@
 #include "buffer_tree.h"
 #include "write.h"
 #include "error.h"
+#include "write_common.h"
 
 /** the array containing the names of all supported writers */
 const char *writer_names[] ={WRITER_NAMES};
@@ -47,30 +47,50 @@ void writer_init(void)
  *
  * \return On success, a pointer to the gengetopt args info struct is returned
  * and \a writer_num contains the number of the writer. Otherwise this function
- * returns \p NULL.
+ * prints an error message and calls exit().
  */
-void *check_writer_arg(const char *wa, int *writer_num)
+void *check_writer_arg_or_die(const char *wa, int *writer_num)
 {
-	int i;
-
-	*writer_num = -E_WRITE_COMMON_SYNTAX;
-	PARA_INFO_LOG("checking  %s\n", wa);
+	int i, ret, argc;
+	const char *cmdline;
+	char **argv;
+	void *conf;
+
+	if (!wa || !*wa) {
+		i = DEFAULT_WRITER;
+		cmdline = NULL;
+		goto check;
+	}
+	PARA_INFO_LOG("checking %s\n", wa);
 	FOR_EACH_WRITER(i) {
 		const char *name = writer_names[i];
 		size_t len = strlen(name);
 		char c;
+
 		if (strlen(wa) < len)
 			continue;
 		if (strncmp(name, wa, len))
 			continue;
 		c = wa[len];
-		if (c && c != ' ')
-			continue;
-		*writer_num = i;
-		return writers[i].parse_config_or_die(c? wa + len + 1 : "");
+		if (!c || c == ' ') {
+			cmdline = c? wa + len + 1 : NULL;
+			goto check;
+		}
 	}
-	PARA_ERROR_LOG("writer not found\n");
-	return NULL;
+	PARA_EMERG_LOG("invalid writer %s\n", wa);
+	exit(EXIT_FAILURE);
+check:
+	ret = create_shifted_argv(cmdline, " \t", &argv);
+	if (ret < 0) {
+		PARA_EMERG_LOG("%s: %s\n", wa, para_strerror(-ret));
+		exit(EXIT_FAILURE);
+	}
+	argc = ret;
+	argv[0] = make_message("%s_write", writer_names[i]);
+	*writer_num = i;
+	conf = writers[i].parse_config_or_die(argc, argv);
+	free_argv(argv);
+	return conf;
 }
 
 /**
@@ -78,80 +98,48 @@ void *check_writer_arg(const char *wa, int *writer_num)
  *
  * \param wn The writer node to open.
  * \param parent The parent btr node (the source for the writer node).
+ * \param s The scheduler instance to register the task to.
  *
  * The configuration of the writer node stored in \p wn->conf must be
  * initialized before this function may be called.
  */
-void register_writer_node(struct writer_node *wn, struct btr_node *parent)
+void register_writer_node(struct writer_node *wn, struct btr_node *parent,
+		struct sched *s)
 {
 	struct writer *w = writers + wn->writer_num;
-	char *name = make_message("%s writer", writer_names[wn->writer_num]);
 
 	wn->btrn = btr_new_node(&(struct btr_node_description)
-		EMBRACE(.name = name, .parent = parent,
+		EMBRACE(.name = writer_names[wn->writer_num], .parent = parent,
 		.handler = w->execute, .context = wn));
-	strcpy(wn->task.status, name);
-	free(name);
-	wn->task.post_select = w->post_select;
-	wn->task.pre_select = w->pre_select;
-	register_task(&wn->task);
-}
-
-/**
- * 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.
- */
-int setup_writer_node(const char *arg, struct btr_node *parent,
-		struct writer_node *wn)
-{
-	if (arg)
-		wn->conf = check_writer_arg(arg, &wn->writer_num);
-	else {
-		wn->writer_num = DEFAULT_WRITER;
-		wn->conf = writers[DEFAULT_WRITER].parse_config_or_die("");
-	}
-	if (!wn->conf)
-		return -E_WRITE_COMMON_SYNTAX;
-	register_writer_node(wn, parent);
-	return 1;
+	wn->task = task_register(&(struct task_info) {
+		.name = writer_names[wn->writer_num],
+		.pre_select = w->pre_select,
+		.post_select = w->post_select,
+		.context = wn,
+	}, s);
 }
 
 /**
  * Print the help text of all writers to stdout.
  *
- * \param detailed Whether to print the detailed help text.
+ * \param flags Passed to \ref ggo_print_help().
  */
-void print_writer_helps(int detailed)
+void print_writer_helps(unsigned flags)
 {
 	int i;
 
-	printf_or_die("\nAvailable writers: \n\t");
+	printf_or_die("\nAvailable writers: ");
 	FOR_EACH_WRITER(i)
 		printf_or_die("%s%s", i? " " : "", writer_names[i]);
-	printf_or_die("\n\n");
+	printf_or_die("\n");
 	FOR_EACH_WRITER(i) {
 		struct writer *w = writers + i;
 
 		if (!w->help.short_help)
 			continue;
-		printf_or_die("Options for %s:\n", writer_names[i]);
-		ggo_print_help(&w->help, detailed);
+		printf_or_die("\n%s: %s", writer_names[i],
+			w->help.purpose);
+		ggo_print_help(&w->help, flags);
 	}
 }