Fix afs shutdown.
[paraslash.git] / write.c
diff --git a/write.c b/write.c
index 498dd78..c692dc9 100644 (file)
--- a/write.c
+++ b/write.c
@@ -1,21 +1,14 @@
 /*
- * Copyright (C) 2005-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
  *
- *     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
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
+/** \file write.c Paraslash's standalone wav/raw player. */
+
+#include <sys/types.h>
+#include <dirent.h>
+
 #include "para.h"
 #include "string.h"
 #include "write.cmdline.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;
-       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;
+       /** Sample rate specified in wav header given by \a buf. */
        unsigned samplerate;
        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 write_args_info conf;
-struct stdin_task sit;
-struct check_wav_task cwt;
-struct initial_delay_task idt;
+
+static struct stdin_task sit;
+
+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
+ * 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 awailable, return one.
+ * 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 *cwt = t->private_data;
+       struct check_wav_task *cwt = container_of(t, struct check_wav_task, task);
        unsigned char *a;
+       int ret;
 
        if (*cwt->loaded < WAV_HEADER_LEN) {
-               t->ret = *cwt->eof? -E_PREMATURE_END : 1;
+               if (*cwt->input_error < 0)
+                       t->error = *cwt->input_error;
                return;
        }
        cwt->channels = 2;
        cwt->samplerate = 44100;
        a = (unsigned char*)cwt->buf;
-       t->ret = -E_NO_WAV_HEADER;
-       if (a[0] != 'R' || a[1] != 'I' || a[2] != 'F' || a[3] != 'F')
-               return;
+       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->ret = -E_WAV_HEADER_SUCCESS;
+       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 *idt = 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 (!idt->start_time.tv_sec && !idt->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, &idt->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;
 }
 
-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;
+       struct initial_delay_task *idt = &the_initial_delay_task;
 
        if (conf.list_writers_given) {
                char *msg = NULL;
@@ -126,93 +137,57 @@ 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",
                                &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) {
-               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];
+               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;
-
-       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.
+ *
+ * \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.
+ *
+ * \return \p EXIT_SUCCESS or EXIT_FAILURE
+ */
 int main(int argc, char *argv[])
 {
        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);
        init_supported_writers();
 
        wng = check_args();
@@ -221,27 +196,33 @@ int main(int argc, char *argv[])
        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);
 
-       s.default_timeout.tv_sec = 1;
-       s.default_timeout.tv_usec = 0;
-       ret = sched(&s);
+       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);
 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);
 }