use own version handler for all commands.

[paraslash.git] / write.c

diff --git a/write.c b/write.c
index 3e5a97e8076e9a3d70bbb0d5386ee9b605a4cae7..683a91b0a78c6f93d19dae229a3fbf510a0fb2e8 100644 (file)
--- a/write.c
+++ b/write.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 2005-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2007 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
  *
  *     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.
  */
 
  *     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"
 #include "para.h"
 #include "string.h"
 #include "write.cmdline.h"


@@ -29,26 +31,41 @@
 
 INIT_WRITE_ERRLISTS;
 
 
 INIT_WRITE_ERRLISTS;
 

+/**
+ * check if given buffer contains a valid wave header
+ */

 struct check_wav_task {
 struct check_wav_task {

+       /** the buffer to check */

        char *buf;
        char *buf;

+       /** number of bytes loaded in \a buf */

        size_t *loaded;
        size_t *loaded;

+       /** non-zero if end of file was reached */

        int *eof;
        int *eof;

+       /** number of channels specified in wav header given by \a buf */

        unsigned channels;
        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;
 };
 
        struct task task;
 };
 

+/**
+ * delay writing until given time
+ */

 struct initial_delay_task {
 struct initial_delay_task {

+       /** the time the first data should be written out */

        struct timeval start_time;
        struct timeval start_time;

+       /** the task structure for this task */

        struct task task;
 };
 
        struct task task;
 };
 

-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;
 
 static struct writer_node_group *wng;
 

+/** length of a standard wav header */

 #define WAV_HEADER_LEN 44
 
 /**
 #define WAV_HEADER_LEN 44
 
 /**


@@ -57,58 +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.
  */
  * \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;
 
        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;
        }
                return;
        }

-       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;
        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;
        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)
 {
 }
 
 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;
        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;
                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;
 }
 
                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;
 
 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;
 
        if (conf.list_writers_given) {
                char *msg = NULL;


@@ -124,8 +134,6 @@ static struct writer_node_group *check_args(void)
                free(msg);
                exit(EXIT_SUCCESS);
        }
                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",
        if (conf.start_time_given) {
                long unsigned sec, usec;
                if (sscanf(conf.start_time_arg, "%lu:%lu",


@@ -135,29 +143,39 @@ static struct writer_node_group *check_args(void)
                idt.start_time.tv_usec = usec;
        }
        if (!conf.writer_given) {
                idt.start_time.tv_usec = usec;
        }
        if (!conf.writer_given) {

-               wng = setup_default_wng();
+               g = setup_default_wng();

                ret = 1;
                goto out;
        }
                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++) {
        for (i = 0; i < conf.writer_given; i++) {

-               ret = check_writer_arg(conf.writer_arg[i]);
-               if (ret < 0)
+               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;
                        goto out;

-               wng->writer_nodes[i].writer = &writers[ret];
-               sprintf(wng->writer_nodes[i].task.status, "%s",
-                       writer_names[ret]);
+               g->writer_nodes[i].writer = &writers[writer_num];

        }
        ret = 1;
 out:
        }
        ret = 1;
 out:

-       if (ret > 0) {
-               return wng;
-       }
-       free(wng);
+       if (ret > 0)
+               return g;
+       free(g);

        return NULL;
 }
 
        return NULL;
 }
 

-static void idt_error_handler(struct task *t)
+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;
 
 {
        int ret;
 


@@ -165,8 +183,10 @@ static void idt_error_handler(struct task *t)
        unregister_task(t);
        wng->buf = sit.buf;
        wng->loaded = &sit.loaded;
        unregister_task(t);
        wng->buf = sit.buf;
        wng->loaded = &sit.loaded;

-       wng->eof = &sit.eof;
-       sprintf(wng->task.status, "%s", "writer node group");
+       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));
        ret = wng_open(wng);
        if (ret < 0) {
                PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));


@@ -174,7 +194,7 @@ static void idt_error_handler(struct task *t)
        }
 }
 
        }
 }
 

-static void cwt_error_handler(struct task *t)
+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));
 {
        if (t->ret != -E_NO_WAV_HEADER && t->ret != -E_WAV_HEADER_SUCCESS) {
                PARA_ERROR_LOG("%s\n", PARA_STRERROR(-t->ret));


@@ -182,51 +202,45 @@ static void cwt_error_handler(struct task *t)
        }
        PARA_INFO_LOG("%s\n", PARA_STRERROR(-t->ret));
        unregister_task(t);
        }
        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;
-       }
+//     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.pre_select = initial_delay_pre_select;
        idt.task.private_data = &idt;

-       idt.task.error_handler = idt_error_handler;
+       idt.task.event_handler = idt_event_handler;

        sprintf(idt.task.status, "initial_delay");
        register_task(&idt.task);
 }
 
        sprintf(idt.task.status, "initial_delay");
        register_task(&idt.task);
 }
 

-static void stdin_error_handler(struct task *t)
-{
-       unregister_task(t);
-       if (t->ret != -E_STDIN_EOF)
-               PARA_ERROR_LOG("%s\n", PARA_STRERROR(-t->ret));
-       else
-               PARA_ERROR_LOG("%s\n", PARA_STRERROR(-t->ret));
-}
-
+/**
+ * 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;
 
 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();
+

        wng = check_args();
        if (!wng)
                goto out;
        wng = check_args();
        if (!wng)
                goto out;

-       init_supported_writers();
-       init_sched();
-
-       sit.bufsize = 16 * 1024,
-       sit.buf = para_malloc(16 * 1024),
-       sit.loaded = 0,
-       sit.task.pre_select = stdin_pre_select;
-       sit.task.post_select = stdin_post_select;
-       sit.task.error_handler = stdin_error_handler;
-       sit.task.private_data = &sit;
-       sprintf(sit.task.status, "stdin reader");
+       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;
        register_task(&sit.task);
 
        cwt.task.pre_select = check_wav_pre_select;
        cwt.task.private_data = &cwt;

-       cwt.task.error_handler = cwt_error_handler;
+       cwt.task.event_handler = cwt_event_handler;

        cwt.buf = sit.buf;
        cwt.loaded = &sit.loaded;
        cwt.eof = &sit.eof;
        cwt.buf = sit.buf;
        cwt.loaded = &sit.loaded;
        cwt.eof = &sit.eof;