X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.c;h=683a91b0a78c6f93d19dae229a3fbf510a0fb2e8;hp=b692ac5080af8dfee4efd79a95048e6c8ad6999d;hb=ce2bb6c458275ec6c0a115a2c814a15761474f11;hpb=14f817d233309fe9ca2580fa8e4b78fd823b9ab9 diff --git a/write.c b/write.c index b692ac50..683a91b0 100644 --- a/write.c +++ b/write.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2006 Andre Noll + * Copyright (C) 2005-2007 Andre Noll * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,6 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. */ +/** \file write.c Paraslash's standalone wav/raw player */ + #include "para.h" #include "string.h" #include "write.cmdline.h" @@ -29,26 +31,41 @@ 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 end of file was reached */ int *eof; + /** number of channels specified in wav header given by \a buf */ unsigned channels; - unsigned sample_rate; + /** samplerate specified in wav header given by \a buf */ + unsigned samplerate; + /** the task structure for this task */ struct task task; }; +/** + * 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 gengetopt_args_info conf; -struct stdin_task sit; -struct check_wav_task cwt; -struct initial_delay_task idt; +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 /** @@ -57,60 +74,51 @@ static struct writer_node_group *wng; * \return If not, return -E_NO_WAV_HEADER, otherwise, return zero. If * there is less than WAV_HEADER_LEN bytes awailable, return one. */ -static void check_wav_pre_select(struct sched *s, struct task *t) +static void check_wav_pre_select(__a_unused struct sched *s, struct task *t) { - struct check_wav_task *cwt = t->private_data; + struct check_wav_task *wt = t->private_data; unsigned char *a; - if (*cwt->loaded < WAV_HEADER_LEN) { - t->ret = *cwt->eof? -E_PREMATURE_END : 1; + if (*wt->loaded < WAV_HEADER_LEN) { + t->ret = *wt->eof? -E_PREMATURE_END : 1; return; } - cwt->channels = 2; - cwt->sample_rate = 44100; - a = (unsigned char*)cwt->buf; + 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; - cwt->channels = (unsigned) a[22]; - cwt->sample_rate = 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); + 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", cwt->channels, cwt->sample_rate); + PARA_INFO_LOG("channels: %d, sample rate: %d\n", wt->channels, wt->samplerate); } static void initial_delay_pre_select(struct sched *s, struct task *t) { - struct initial_delay_task *idt = t->private_data; + struct initial_delay_task *dt = t->private_data; struct timeval diff; t->ret = -E_NO_DELAY; - if (!idt->start_time.tv_sec && !idt->start_time.tv_usec) + if (!dt->start_time.tv_sec && !dt->start_time.tv_usec) return; t->ret = -E_DELAY_TIMEOUT; - if (tv_diff(&s->now, &idt->start_time, &diff) > 0) + if (tv_diff(now, &dt->start_time, &diff) > 0) return; t->ret = 1; if (tv_diff(&s->timeout , &diff, NULL) > 0) s->timeout = diff; } -void para_log(int ll, const char* fmt,...) -{ - va_list argp; - - if (ll < conf.loglevel_arg) - return; - va_start(argp, fmt); - vfprintf(stderr, fmt, argp); - va_end(argp); -} +INIT_STDERR_LOGGING(conf.loglevel_arg) static struct writer_node_group *check_args(void) { int i, ret = -E_WRITE_SYNTAX; - struct writer_node_group *wng = NULL; + struct writer_node_group *g = NULL; if (conf.list_writers_given) { char *msg = NULL; @@ -126,8 +134,6 @@ static struct writer_node_group *check_args(void) free(msg); exit(EXIT_SUCCESS); } -// if (conf.prebuffer_arg < 0 || conf.prebuffer_arg > 100) -// goto out; if (conf.start_time_given) { long unsigned sec, usec; if (sscanf(conf.start_time_arg, "%lu:%lu", @@ -137,30 +143,38 @@ static struct writer_node_group *check_args(void) idt.start_time.tv_usec = usec; } if (!conf.writer_given) { - wng = setup_default_wng(); + g = setup_default_wng(); ret = 1; goto out; } - wng = wng_new(conf.writer_given); + g = wng_new(conf.writer_given); ret = -E_WRITE_SYNTAX; for (i = 0; i < conf.writer_given; i++) { int writer_num; - wng->writer_nodes[i].conf = check_writer_arg( + g->writer_nodes[i].conf = check_writer_arg( conf.writer_arg[i], &writer_num); - if (!wng->writer_nodes[i].conf) + if (!g->writer_nodes[i].conf) goto out; - wng->writer_nodes[i].writer = &writers[writer_num]; - sprintf(wng->writer_nodes[i].task.status, "%s", - writer_names[writer_num]); + g->writer_nodes[i].writer = &writers[writer_num]; } ret = 1; out: if (ret > 0) - return wng; - free(wng); + return g; + free(g); return NULL; } +static void wng_event_handler(struct task *t) +{ + struct writer_node_group *g = t->private_data; + + PARA_INFO_LOG("%s\n", PARA_STRERROR(-t->ret)); + unregister_task(t); + wng_close(g); +} + + static void idt_event_handler(struct task *t) { int ret; @@ -170,6 +184,9 @@ static void idt_event_handler(struct task *t) wng->buf = sit.buf; wng->loaded = &sit.loaded; wng->input_eof = &sit.eof; + 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)); @@ -196,14 +213,21 @@ static void cwt_event_handler(struct task *t) register_task(&idt.task); } +/** + * para_write's main function + * + * It registers the stdin task, the check_wav_task, the task for initial delay + * and all tasks for actually writing out the stream. + * + */ int main(int argc, char *argv[]) { int ret = -E_WRITE_SYNTAX; struct sched s; - cmdline_parser(argc, argv, &conf); + write_cmdline_parser(argc, argv, &conf); + HANDLE_VERSION_FLAG("write", conf); init_supported_writers(); - init_sched(); wng = check_args(); if (!wng)