X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.c;h=acfb94605b53d259a89ea41e75507b81e2cb2ca4;hp=9ff3bc8406a252819a686d4d6e14d330951a6278;hb=e7f035b3ad7ecc64ec87d9ce890f89365dec1411;hpb=0d80158e37ae419695fbd51eed59b92b9ebccf5d diff --git a/write.c b/write.c index 9ff3bc84..acfb9460 100644 --- a/write.c +++ b/write.c @@ -1,24 +1,20 @@ -/* - * Copyright (C) 2005 Andre Noll - * - * Licensed under the GPL v2. For licencing details see COPYING. - */ +/* Copyright (C) 2005 Andre Noll , see file COPYING. */ /** \file write.c Paraslash's standalone wav/raw player. */ #include #include +#include +#include "write_cmd.lsg.h" +#include "write.lsg.h" #include "para.h" #include "string.h" -#include "write.cmdline.h" #include "list.h" #include "sched.h" -#include "ggo.h" #include "stdin.h" #include "buffer_tree.h" #include "write.h" -#include "write_common.h" #include "fd.h" #include "error.h" #include "version.h" @@ -27,48 +23,30 @@ /** Array of error strings. */ DEFINE_PARA_ERRLIST; -static struct write_args_info conf; +#define CMD_PTR (lls_cmd(0, write_suite)) +#define OPT_RESULT(_name, _lpr) \ + (lls_opt_result(LSG_WRITE_PARA_WRITE_OPT_ ## _name, _lpr)) +#define OPT_GIVEN(_name, _lpr) (lls_opt_given(OPT_RESULT(_name, _lpr))) +#define OPT_UINT32_VAL(_name, _lpr) (lls_uint32_val(0, OPT_RESULT(_name, _lpr))) static struct stdin_task sit; - static int loglevel; INIT_STDERR_LOGGING(loglevel) -__noreturn static void print_help_and_die(void) -{ - struct ggo_help h = DEFINE_GGO_HELP(write); - 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); - 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 and oss for *BSD, and the - * file writer if neither is 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) +static void handle_help_flag(struct lls_parse_result *lpr) { - wn->conf = check_writer_arg_or_die(arg, &wn->writer_num); - register_writer_node(wn, parent, s); + char *help; + + if (OPT_GIVEN(DETAILED_HELP, lpr)) + help = lls_long_help(CMD_PTR); + else if (OPT_GIVEN(HELP, lpr)) + help = lls_short_help(CMD_PTR); + else + return; + printf("%s\n", help); + free(help); + print_writer_helps(OPT_GIVEN(DETAILED_HELP, lpr)); + exit(EXIT_SUCCESS); } struct write_task { @@ -88,9 +66,9 @@ static int write_post_select(__a_unused struct sched *s, void *context) return check_wav_post_select(wt->cwc); } -static int setup_and_schedule(void) +static int setup_and_schedule(struct lls_parse_result *lpr) { - int i, ret; + int i, n, ret, writer_given = OPT_GIVEN(WRITER, lpr); struct btr_node *cw_btrn; struct writer_node *wns; static struct sched s; @@ -101,7 +79,7 @@ static int setup_and_schedule(void) EMBRACE(.name = "stdin")); stdin_task_register(&sit, &s); - COPY_WAV_PARMS(&wp, &conf); + LLS_COPY_WAV_PARMS(&wp, LSG_WRITE_PARA_WRITE, lpr); wt.cwc = check_wav_init(sit.btrn, NULL, &wp, &cw_btrn); wt.task = task_register(&(struct task_info) { .name = "write", @@ -109,28 +87,26 @@ 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 = writer_given? writer_given : 1; + wns = para_calloc(n * sizeof(*wns)); + for (i = 0; i < n; i++) { + const char *arg = i < writer_given? + lls_string_val(i, OPT_RESULT(WRITER, lpr)) : 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 +114,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); @@ -167,18 +141,23 @@ static int setup_and_schedule(void) int main(int argc, char *argv[]) { int ret; - - 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(); - - ret = setup_and_schedule(); + struct lls_parse_result *lpr; + char *errctx; + + ret = lls(lls_parse(argc, argv, CMD_PTR, &lpr, &errctx)); + if (ret < 0) + goto out; + loglevel = OPT_UINT32_VAL(LOGLEVEL, lpr); + version_handle_flag("write", OPT_GIVEN(VERSION, lpr)); + handle_help_flag(lpr); + ret = setup_and_schedule(lpr); + lls_free_parse_result(lpr, CMD_PTR); +out: if (ret < 0) { + if (errctx) + PARA_ERROR_LOG("%s\n", errctx); + free(errctx); PARA_ERROR_LOG("%s\n", para_strerror(-ret)); - exit(EXIT_FAILURE); } - exit(EXIT_SUCCESS); + return ret < 0? EXIT_FAILURE : EXIT_SUCCESS; }