/*
- * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
char *buf;
/** Number of bytes loaded in \a buf. */
size_t *loaded;
- /** Non-zero if end of file was reached. */
- int *eof;
+ /** 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;
- /** Samplerate specified in wav header given by \a buf. */
+ /** Sample rate specified in wav header given by \a buf. */
unsigned samplerate;
- /** The task structure for this task. */
struct task task;
};
};
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 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. */
*/
static void check_wav_pre_select(__a_unused struct sched *s, struct task *t)
{
- struct check_wav_task *wt = t->private_data;
+ struct check_wav_task *cwt = container_of(t, struct check_wav_task, task);
unsigned char *a;
+ int ret;
- if (*wt->loaded < WAV_HEADER_LEN) {
- t->ret = *wt->eof? -E_PREMATURE_END : 1;
+ if (*cwt->loaded < WAV_HEADER_LEN) {
+ if (*cwt->input_error < 0)
+ t->error = *cwt->input_error;
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);
+ 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;
}
static void initial_delay_pre_select(struct sched *s, struct task *t)
{
- struct initial_delay_task *dt = t->private_data;
+ struct initial_delay_task *idt = container_of(t, struct initial_delay_task, task);
struct timeval diff;
- t->ret = -E_NO_DELAY;
- if (!dt->start_time.tv_sec && !dt->start_time.tv_usec)
+ if (!idt->start_time.tv_sec && !idt->start_time.tv_usec) {
+ t->error = -E_NO_DELAY;
return;
- t->ret = -E_DELAY_TIMEOUT;
- if (tv_diff(now, &dt->start_time, &diff) > 0)
+ }
+ if (tv_diff(now, &idt->start_time, &diff) > 0) {
+ t->error = -E_DELAY_TIMEOUT;
return;
- t->ret = 1;
+ }
if (tv_diff(&s->timeout , &diff, NULL) > 0)
s->timeout = diff;
}
{
int i, ret = -E_WRITE_SYNTAX;
struct writer_node_group *g = NULL;
+ struct initial_delay_task *idt = &the_initial_delay_task;
if (conf.list_writers_given) {
char *msg = NULL;
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;
+ idt->start_time.tv_sec = sec;
+ idt->start_time.tv_usec = usec;
}
if (!conf.writer_given) {
g = setup_default_wng();
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;
-
- PARA_INFO_LOG("%s\n", PARA_STRERROR(-t->ret));
- unregister_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));
- exit(EXIT_FAILURE);
- }
-}
-
-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);
- }
- 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);
-}
-
/**
* Para_write's main function.
*
{
int ret = -E_WRITE_SYNTAX;
struct sched s;
+ struct check_wav_task *cwt = &the_check_wav_task;
+ struct initial_delay_task *idt = &the_initial_delay_task;
write_cmdline_parser(argc, argv, &conf);
HANDLE_VERSION_FLAG("write", conf);
stdin_set_defaults(&sit);
if (conf.bufsize_given)
sit.bufsize = conf.bufsize_arg;
- sit.buf = para_malloc(sit.bufsize),
+ sit.buf = para_malloc(sit.bufsize);
+
+ wng->buf = sit.buf;
+ wng->loaded = &sit.loaded;
+ wng->input_error = &sit.task.error;
+
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.eof = &sit.eof;
- sprintf(cwt.task.status, "check wav");
- register_task(&cwt.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;
+ register_task(&cwt->task);
+
+ idt->task.pre_select = initial_delay_pre_select;
+ sprintf(idt->task.status, "initial_delay");
+ register_task(&idt->task);
- s.default_timeout.tv_sec = 1;
+ s.default_timeout.tv_sec = 10;
s.default_timeout.tv_usec = 0;
ret = schedule(&s);
-
+ wng_close(wng);
out:
if (ret < 0) {
- PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
- ret = EXIT_FAILURE;
- } else
- ret = EXIT_SUCCESS;
- return ret;
+ PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+ exit(EXIT_FAILURE);
+ }
+ exit(EXIT_SUCCESS);
}
projects / paraslash.git / blobdiff