X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=write.c;h=acfb94605b53d259a89ea41e75507b81e2cb2ca4;hb=e32a0e7295c6386b421956553ae577a7df1abf8e;hp=672f3e249769be23a681a6b3b8c2eb9c4ed4e331;hpb=c8862b9e246b4ef6ff1fe103946e18cf2537ecde;p=paraslash.git diff --git a/write.c b/write.c index 672f3e24..acfb9460 100644 --- a/write.c +++ b/write.c @@ -1,203 +1,130 @@ -/* - * Copyright (C) 2005-2008 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 "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 *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 for this task. */ - 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; -}; +#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 write_args_info conf; static struct stdin_task sit; -static struct check_wav_task cwt; -static struct initial_delay_task idt; -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) -{ - struct check_wav_task *wt = t->private_data; - unsigned char *a; - - if (*wt->loaded < WAV_HEADER_LEN) { - t->ret = *wt->error? -E_PREMATURE_END : 1; - return; - } - wt->channels = 2; - wt->samplerate = 44100; - a = (unsigned char*)wt->buf; - t->ret = -E_NO_WAV_HEADER; - if (a[0] != 'R' || a[1] != 'I' || a[2] != 'F' || a[3] != 'F') - return; - wt->channels = (unsigned) a[22]; - wt->samplerate = a[24] + (a[25] << 8) + (a[26] << 16) + (a[27] << 24); - *wt->loaded -= WAV_HEADER_LEN; - memmove(wt->buf, wt->buf + WAV_HEADER_LEN, *wt->loaded); - t->ret = -E_WAV_HEADER_SUCCESS; - PARA_INFO_LOG("channels: %d, sample rate: %d\n", wt->channels, wt->samplerate); -} +static int loglevel; +INIT_STDERR_LOGGING(loglevel) -static void initial_delay_pre_select(struct sched *s, struct task *t) +static void handle_help_flag(struct lls_parse_result *lpr) { - struct initial_delay_task *dt = t->private_data; - struct timeval diff; + char *help; - t->ret = -E_NO_DELAY; - if (!dt->start_time.tv_sec && !dt->start_time.tv_usec) - return; - t->ret = -E_DELAY_TIMEOUT; - if (tv_diff(now, &dt->start_time, &diff) > 0) + 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; - t->ret = 1; - if (tv_diff(&s->timeout , &diff, NULL) > 0) - s->timeout = diff; + printf("%s\n", help); + free(help); + print_writer_helps(OPT_GIVEN(DETAILED_HELP, lpr)); + exit(EXIT_SUCCESS); } -INIT_STDERR_LOGGING(conf.loglevel_arg) +struct write_task { + struct task *task; + struct check_wav_context *cwc; +}; -static struct writer_node_group *check_args(void) +static void write_pre_select(struct sched *s, void *context) { - int i, ret = -E_WRITE_SYNTAX; - struct writer_node_group *g = NULL; - - if (conf.list_writers_given) { - char *msg = NULL; - FOR_EACH_WRITER(i) { - char *tmp = make_message("%s%s%s", - i? msg : "", - i? " " : "", - writer_names[i]); - free(msg); - msg = tmp; - } - fprintf(stderr, "%s\n", msg); - free(msg); - exit(EXIT_SUCCESS); - } - 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; - } - if (!conf.writer_given) { - g = setup_default_wng(); - ret = 1; - goto out; - } - 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 = &writers[writer_num]; - } - ret = 1; -out: - if (ret > 0) - return g; - free(g); - return NULL; + struct write_task *wt = context; + check_wav_pre_select(s, wt->cwc); } -static void wng_event_handler(struct task *t) +static int write_post_select(__a_unused struct sched *s, void *context) { - struct writer_node_group *g = t->private_data; - - PARA_INFO_LOG("%s\n", para_strerror(-t->ret)); - unregister_task(t); - wng_close(g); + struct write_task *wt = context; + return check_wav_post_select(wt->cwc); } - -static void idt_event_handler(struct task *t) +static int setup_and_schedule(struct lls_parse_result *lpr) { - int ret; - - PARA_INFO_LOG("%s\n", para_strerror(-t->ret)); - unregister_task(t); - wng->buf = sit.buf; - wng->loaded = &sit.loaded; - wng->input_error = &sit.error; - wng->task.event_handler = wng_event_handler; - wng->channels = &cwt.channels; - wng->samplerate = &cwt.samplerate; - ret = wng_open(wng); - if (ret < 0) { - PARA_ERROR_LOG("%s\n", para_strerror(-ret)); - exit(EXIT_FAILURE); + 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); } -} - -static void cwt_event_handler(struct task *t) -{ - if (t->ret != -E_NO_WAV_HEADER && t->ret != -E_WAV_HEADER_SUCCESS) { - PARA_ERROR_LOG("%s\n", para_strerror(-t->ret)); - exit(EXIT_FAILURE); + 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; + } + } + } + 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)); } - PARA_INFO_LOG("%s\n", para_strerror(-t->ret)); - unregister_task(t); -// if (t->ret == -E_WAV_HEADER_SUCCESS) { -// conf.channels_arg = cwt.channels; -// conf.sample_rate_arg = cwt.sample_rate; -// } - idt.task.pre_select = initial_delay_pre_select; - idt.task.private_data = &idt; - idt.task.event_handler = idt_event_handler; - sprintf(idt.task.status, "initial_delay"); - register_task(&idt.task); + free(wns); + check_wav_shutdown(wt.cwc); + sched_shutdown(&s); + return ret; } /** @@ -206,47 +133,31 @@ static void cwt_event_handler(struct task *t) * \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; - struct sched s; - - write_cmdline_parser(argc, argv, &conf); - HANDLE_VERSION_FLAG("write", conf); - init_supported_writers(); + int ret; + struct lls_parse_result *lpr; + char *errctx; - wng = check_args(); - if (!wng) + ret = lls(lls_parse(argc, argv, CMD_PTR, &lpr, &errctx)); + if (ret < 0) goto out; - stdin_set_defaults(&sit); - if (conf.bufsize_given) - sit.bufsize = conf.bufsize_arg; - sit.buf = para_malloc(sit.bufsize), - register_task(&sit.task); - - cwt.task.pre_select = check_wav_pre_select; - cwt.task.private_data = &cwt; - cwt.task.event_handler = cwt_event_handler; - cwt.buf = sit.buf; - cwt.loaded = &sit.loaded; - cwt.error = &sit.error; - sprintf(cwt.task.status, "check wav"); - register_task(&cwt.task); - - s.default_timeout.tv_sec = 1; - s.default_timeout.tv_usec = 0; - ret = schedule(&s); - + 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)); - ret = EXIT_FAILURE; - } else - ret = EXIT_SUCCESS; - return ret; + } + return ret < 0? EXIT_FAILURE : EXIT_SUCCESS; }