X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.c;h=acfb94605b53d259a89ea41e75507b81e2cb2ca4;hp=34cea48c6a81ab2d7d6743e28706181415362824;hb=686310d4b954efec5d5dcc8b4a143c294bb02739;hpb=aef566e9c8680629bac1ea84893b8b3ccd13da77 diff --git a/write.c b/write.c index 34cea48c..acfb9460 100644 --- a/write.c +++ b/write.c @@ -1,182 +1,130 @@ -/* - * Copyright (C) 2005-2009 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 +#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" +#include "check_wav.h" -INIT_WRITE_ERRLISTS; - -/** Check if given buffer contains a valid wave header. */ -struct check_wav_task { - /** The buffer to check. */ - char *buf; - /** Number of bytes loaded in \a buf. */ - size_t *loaded; - /** Non-zero if an error occurred or end of file was reached. */ - int *input_error; - /** Number of channels specified in wav header given by \a buf. */ - unsigned channels; - /** Sample rate specified in wav header given by \a buf. */ - unsigned samplerate; - /** The task structure used by the scheduler. */ - struct task task; -}; +/** Array of error strings. */ +DEFINE_PARA_ERRLIST; -/** Delay writing until given time. */ -struct initial_delay_task { - /** The time the first data should be written out. */ - struct timeval start_time; - /** The task structure for this task. */ - struct task task; -}; - -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) -static struct check_wav_task the_check_wav_task; -static struct initial_delay_task the_initial_delay_task; - -static struct writer_node_group *wng; - -/** Length of a standard wav header. */ -#define WAV_HEADER_LEN 44 - -/** - * Test if audio buffer contains a valid wave header. - * - * \return If not, return -E_NO_WAV_HEADER, otherwise, return zero. If - * there is less than WAV_HEADER_LEN bytes available, return one. - */ -static void check_wav_pre_select(__a_unused struct sched *s, struct task *t) +static void handle_help_flag(struct lls_parse_result *lpr) { - struct check_wav_task *cwt = container_of(t, struct check_wav_task, task); - unsigned char *a; - int ret; + char *help; - if (*cwt->loaded < WAV_HEADER_LEN) { - if (*cwt->input_error < 0) - t->error = *cwt->input_error; + 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; - } - cwt->channels = 2; - cwt->samplerate = 44100; - a = (unsigned char*)cwt->buf; - if (a[0] != 'R' || a[1] != 'I' || a[2] != 'F' || a[3] != 'F') { - PARA_NOTICE_LOG("wav header not found\n"); - t->error = -E_NO_WAV_HEADER; - goto out; - } - cwt->channels = (unsigned) a[22]; - cwt->samplerate = a[24] + (a[25] << 8) + (a[26] << 16) + (a[27] << 24); - *cwt->loaded -= WAV_HEADER_LEN; - memmove(cwt->buf, cwt->buf + WAV_HEADER_LEN, *cwt->loaded); - t->error = -E_WAV_HEADER_SUCCESS; - PARA_INFO_LOG("channels: %d, sample rate: %d\n", cwt->channels, cwt->samplerate); -out: - wng->channels = &cwt->channels; - wng->samplerate = &cwt->samplerate; - ret = wng_open(wng); - if (ret < 0) - t->error = ret; - s->timeout.tv_sec = 0; - s->timeout.tv_usec = 1; + printf("%s\n", help); + free(help); + print_writer_helps(OPT_GIVEN(DETAILED_HELP, lpr)); + exit(EXIT_SUCCESS); } -static void initial_delay_pre_select(struct sched *s, struct task *t) -{ - struct initial_delay_task *idt = container_of(t, struct initial_delay_task, task); - struct timeval diff; +struct write_task { + struct task *task; + struct check_wav_context *cwc; +}; - if (!idt->start_time.tv_sec && !idt->start_time.tv_usec) { - t->error = -E_NO_DELAY; - goto register_check_wav; - } - if (tv_diff(now, &idt->start_time, &diff) > 0) { - t->error = -E_DELAY_TIMEOUT; - goto register_check_wav; - } - if (tv_diff(&s->timeout , &diff, NULL) > 0) - s->timeout = diff; - return; -register_check_wav: - register_task(&the_check_wav_task.task); - s->timeout.tv_sec = 0; - s->timeout.tv_usec = 1; +static void write_pre_select(struct sched *s, void *context) +{ + struct write_task *wt = context; + check_wav_pre_select(s, wt->cwc); } -static int loglevel; -INIT_STDERR_LOGGING(loglevel) +static int write_post_select(__a_unused struct sched *s, void *context) +{ + struct write_task *wt = context; + return check_wav_post_select(wt->cwc); +} -static struct writer_node_group *check_args(void) +static int setup_and_schedule(struct lls_parse_result *lpr) { - int i, ret = -E_WRITE_SYNTAX; - struct writer_node_group *g = NULL; - struct initial_delay_task *idt = &the_initial_delay_task; - - loglevel = get_loglevel_by_name(conf.loglevel_arg); - if (conf.start_time_given) { - long unsigned sec, usec; - if (sscanf(conf.start_time_arg, "%lu:%lu", - &sec, &usec) != 2) - goto out; - idt->start_time.tv_sec = sec; - idt->start_time.tv_usec = usec; + int i, n, ret, writer_given = OPT_GIVEN(WRITER, lpr); + struct btr_node *cw_btrn; + struct writer_node *wns; + static struct sched s; + struct wav_params wp; + struct write_task wt; + + sit.btrn = btr_new_node(&(struct btr_node_description) + EMBRACE(.name = "stdin")); + stdin_task_register(&sit, &s); + + 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", + .pre_select = write_pre_select, + .post_select = write_post_select, + .context = &wt, + }, &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); } - if (!conf.writer_given) { - g = setup_default_wng(); - ret = 1; - goto out; + 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 < 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_name(wn->wid); + PARA_ERROR_LOG("%s: %s\n", name, + para_strerror(-ts)); + if (ret >= 0) + ret = ts; + } + } } - g = wng_new(conf.writer_given); - ret = -E_WRITE_SYNTAX; - for (i = 0; i < conf.writer_given; i++) { - int writer_num; - g->writer_nodes[i].conf = check_writer_arg( - conf.writer_arg[i], &writer_num); - if (!g->writer_nodes[i].conf) - goto out; - g->writer_nodes[i].writer_num = writer_num; + for (i = n - 1; i >= 0; i--) { + struct writer_node *wn = wns + i; + writer_get(wn->wid)->close(wn); + btr_remove_node(&wn->btrn); + lls_free_parse_result(wns[i].lpr, + lls_cmd(wn->wid, write_cmd_suite)); } - ret = 1; -out: - if (ret > 0) - return g; - free(g); - return NULL; -} - -__noreturn static void print_help_and_die(void) -{ - int d = conf.detailed_help_given; - const char **p = d? write_args_info_detailed_help - : write_args_info_help; - - printf_or_die("%s\n\n", WRITE_CMDLINE_PARSER_PACKAGE "-" - WRITE_CMDLINE_PARSER_VERSION); - printf_or_die("%s\n\n", write_args_info_usage); - for (; *p; p++) - printf_or_die("%s\n", *p); - print_writer_helps(d); - exit(0); + free(wns); + check_wav_shutdown(wt.cwc); + sched_shutdown(&s); + return ret; } /** @@ -185,60 +133,31 @@ __noreturn static void print_help_and_die(void) * \param argc The usual argument counter. * \param argv The usual argument vector. * - * It registers the stdin task, the check_wav_task, the task for initial delay - * and all tasks for actually writing out the stream. + * It sets up and starts the tasks and the buffer tree nodes determined by + * command line options. * * \return \p EXIT_SUCCESS or EXIT_FAILURE */ int main(int argc, char *argv[]) { - int ret = -E_WRITE_SYNTAX; - static struct sched s; - struct check_wav_task *cwt = &the_check_wav_task; - struct initial_delay_task *idt = &the_initial_delay_task; - - writer_init(); - write_cmdline_parser(argc, argv, &conf); - HANDLE_VERSION_FLAG("write", conf); - if (conf.help_given || conf.detailed_help_given) - print_help_and_die(); + int ret; + struct lls_parse_result *lpr; + char *errctx; - wng = check_args(); - if (!wng) - goto out; - stdin_set_defaults(&sit); - ret = -ERRNO_TO_PARA_ERROR(EINVAL); - if (conf.bufsize_arg < 0) - goto out; - if (conf.bufsize_arg >= INT_MAX / 1024) + ret = lls(lls_parse(argc, argv, CMD_PTR, &lpr, &errctx)); + if (ret < 0) goto out; - sit.bufsize = conf.bufsize_arg * 1024; - sit.buf = para_malloc(sit.bufsize); - - wng->bufp = &sit.buf; - wng->loaded = &sit.loaded; - wng->input_error = &sit.task.error; - - register_task(&sit.task); - - cwt->buf = sit.buf; - cwt->loaded = &sit.loaded; - cwt->input_error = &sit.task.error; - sprintf(cwt->task.status, "check wav"); - cwt->task.pre_select = check_wav_pre_select; - - idt->task.pre_select = initial_delay_pre_select; - sprintf(idt->task.status, "initial_delay"); - register_task(&idt->task); - - s.default_timeout.tv_sec = 10; - s.default_timeout.tv_usec = 0; - ret = schedule(&s); - wng_close(wng); + 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; }