X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.c;h=acfb94605b53d259a89ea41e75507b81e2cb2ca4;hp=946653f62dfa140d9930f74cc3350262b66ba542;hb=e7f035b3ad7ecc64ec87d9ce890f89365dec1411;hpb=85094cd802bdb606d4e2bf7ed66dec51db2a0953 diff --git a/write.c b/write.c index 946653f6..acfb9460 100644 --- a/write.c +++ b/write.c @@ -1,264 +1,129 @@ -/* - * Copyright (C) 2005-2011 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" +#include "check_wav.h" -INIT_WRITE_ERRLISTS; - -enum check_wav_state { - CWS_NEED_HEADER, - CWS_HAVE_HEADER, - CWS_NO_HEADER, -}; - -/* Information extracted from the wav header. */ -struct check_wav_task { - int state; - /** Number of channels. */ - unsigned channels; - unsigned sample_format; - /** Sample rate specified in wav header given by \a buf. */ - unsigned sample_rate; - /** The task structure used by the scheduler. */ - struct task task; - struct btr_node *btrn; - size_t min_iqs; -}; +/** 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) -/** Length of a standard wav header. */ -#define WAV_HEADER_LEN 44 - -static void check_wav_pre_select(struct sched *s, struct task *t) -{ - struct check_wav_task *cwt = container_of(t, struct check_wav_task, task); - int ret; - - ret = btr_node_status(cwt->btrn, cwt->min_iqs, BTR_NT_INTERNAL); - if (ret != 0) - sched_min_delay(s); -} - -#define HANDLE_EXEC(_cmd) \ - if (!strcmp(cmd, #_cmd)) { \ - if (!conf._cmd ## _given && cwt->state == CWS_NEED_HEADER) \ - return -E_BTR_NAVAIL; \ - *result = make_message("%d", cwt->state == CWS_NO_HEADER || conf._cmd ## _given? \ - conf._cmd ## _arg : cwt->_cmd); \ - return 1; \ - } \ - - -static int check_wav_exec(struct btr_node *btrn, const char *cmd, char **result) -{ - struct check_wav_task *cwt = btr_context(btrn); - - HANDLE_EXEC(sample_rate); - HANDLE_EXEC(channels); - HANDLE_EXEC(sample_format); - return -ERRNO_TO_PARA_ERROR(ENOTSUP); -} - -static void check_wav_post_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); - struct btr_node *btrn = cwt->btrn; - unsigned char *a; - size_t sz; - int ret; - uint16_t bps; /* bits per sample */ - const char *sample_formats[] = {SAMPLE_FORMATS}; + char *help; - t->error = 0; - ret = btr_node_status(btrn, cwt->min_iqs, BTR_NT_INTERNAL); - if (ret <= 0) - goto out; - if (cwt->state != CWS_NEED_HEADER) - goto pushdown; - btr_merge(btrn, cwt->min_iqs); - sz = btr_next_buffer(btrn, (char **)&a); - if (sz < cwt->min_iqs) /* file size less than WAV_HEADER_SIZE */ - goto pushdown; - cwt->min_iqs = 0; - /* - * The default byte ordering assumed for WAVE data files is - * little-endian. Files written using the big-endian byte ordering - * scheme have the identifier RIFX instead of RIFF. - */ - if (a[0] != 'R' || a[1] != 'I' || a[2] != 'F' || - (a[3] != 'F' && a[3] != 'X')) { - PARA_NOTICE_LOG("wav header not found\n"); - cwt->state = CWS_NO_HEADER; - sprintf(t->status, "check wav: no header"); - goto out; - } - PARA_INFO_LOG("found wav header\n"); - cwt->state = CWS_HAVE_HEADER; - sprintf(t->status, "check wav: have header"); - cwt->channels = (unsigned) a[22]; - cwt->sample_rate = a[24] + (a[25] << 8) + (a[26] << 16) + (a[27] << 24); - bps = a[34] + ((unsigned)a[35] << 8); - if (bps != 8 && bps != 16) { - PARA_WARNING_LOG("%u bps not supported, assuming 16\n", bps); - bps = 16; - } - /* - * 8-bit samples are stored as unsigned bytes, ranging from 0 to 255. - * 16-bit samples are stored as 2's-complement signed integers, ranging - * from -32768 to 32767. - */ - if (bps == 8) - cwt->sample_format = SF_U8; + 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 - cwt->sample_format = (a[3] == 'F')? SF_S16_LE : SF_S16_BE; - PARA_NOTICE_LOG("%dHz, %s, %s\n", cwt->sample_rate, - cwt->channels == 1? "mono" : "stereo", - sample_formats[cwt->sample_format]); - btr_consume(btrn, WAV_HEADER_LEN); -pushdown: - btr_pushdown(btrn); -out: - t->error = ret; - if (ret < 0) - btr_remove_node(btrn); + return; + printf("%s\n", help); + free(help); + print_writer_helps(OPT_GIVEN(DETAILED_HELP, lpr)); + exit(EXIT_SUCCESS); } -static int loglevel; -INIT_STDERR_LOGGING(loglevel) +struct write_task { + struct task *task; + struct check_wav_context *cwc; +}; -__noreturn static void print_help_and_die(void) +static void write_pre_select(struct sched *s, void *context) { - 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); + struct write_task *wt = context; + check_wav_pre_select(s, wt->cwc); } -/* - * 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) +static int write_post_select(__a_unused struct sched *s, void *context) { - if (arg) - wn->conf = check_writer_arg_or_die(arg, &wn->writer_num); - else { - wn->writer_num = DEFAULT_WRITER; - wn->conf = writers[DEFAULT_WRITER].parse_config_or_die(""); - } - register_writer_node(wn, parent, s); + struct write_task *wt = 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; - struct check_wav_task _cwt, *cwt = &_cwt; + 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; - loglevel = get_loglevel_by_name(conf.loglevel_arg); sit.btrn = btr_new_node(&(struct btr_node_description) EMBRACE(.name = "stdin")); - stdin_set_defaults(&sit); - register_task(&s, &sit.task); - - cwt->state = CWS_NEED_HEADER; - cwt->min_iqs = WAV_HEADER_LEN; - cwt->btrn = btr_new_node(&(struct btr_node_description) - EMBRACE(.name = "check_wav", .parent = sit.btrn, - .handler = check_wav_exec, .context = cwt)); - sprintf(cwt->task.status, "check_wav"); - cwt->task.pre_select = check_wav_pre_select; - cwt->task.post_select = check_wav_post_select; - cwt->task.error = 0; - register_task(&s, &cwt->task); - - if (!conf.writer_given) { - wns = para_calloc(sizeof(*wns)); - setup_writer_node(NULL, cwt->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], cwt->btrn, - wns + i, &s); + 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); } - s.default_timeout.tv_sec = 10; s.default_timeout.tv_usec = 50000; ret = schedule(&s); if (ret >= 0) { - int j; - for (j = 0; j < i; j++) { - struct task *t = &wns[j].task; - assert(t->error < 0); - if (t->error != -E_WRITE_COMMON_EOF - && t->error != -E_BTR_EOF) { - PARA_ERROR_LOG("%s: %s\n", t->status, - para_strerror(-t->error)); + 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 = t->error; + ret = ts; } } } - 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); - btr_free_node(wn->btrn); - w->free_config(wn->conf); - free(wn->conf); + 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)); } free(wns); - btr_free_node(cwt->btrn); + check_wav_shutdown(wt.cwc); + sched_shutdown(&s); return ret; } @@ -276,17 +141,23 @@ static int setup_and_schedule(void) int main(int argc, char *argv[]) { int ret; + struct lls_parse_result *lpr; + char *errctx; - 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(); - - ret = setup_and_schedule(); + 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; }