Merge branch 'refs/heads/t/invalid-ids'
[paraslash.git] / write.c
diff --git a/write.c b/write.c
index a8e2429ce0f8a659492e3f29fcf4d504318fce4d..b3f103e97d4ae1c5e1f84c6fe2de8bb1bac70df3 100644 (file)
--- a/write.c
+++ b/write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 #include "fd.h"
 #include "error.h"
 #include "version.h"
+#include "check_wav.h"
 
 INIT_WRITE_ERRLISTS;
 
-enum check_wav_state {
-       CWS_NEED_HEADER,
-       CWS_HAVE_HEADER,
-       CWS_NO_HEADER,
-};
-
-/* Information extracted from the wav header. */
-struct check_wav_task {
-       int state;
-       /** Number of channels. */
-       unsigned channels;
-       unsigned sample_format;
-       /** Sample rate specified in wav header given by \a buf. */
-       unsigned sample_rate;
-       /** The task structure used by the scheduler. */
-       struct task task;
-       struct btr_node *btrn;
-       size_t min_iqs;
-};
-
 static struct write_args_info conf;
 
 static struct stdin_task sit;
 
-/** Length of a standard wav header. */
-#define WAV_HEADER_LEN 44
-
-static void check_wav_pre_select(struct sched *s, struct task *t)
-{
-       struct check_wav_task *cwt = container_of(t, struct check_wav_task, task);
-       int ret;
-
-       ret = btr_node_status(cwt->btrn, cwt->min_iqs, BTR_NT_INTERNAL);
-       if (ret != 0)
-               sched_min_delay(s);
-}
-
-#define HANDLE_EXEC(_cmd) \
-       if (!strcmp(cmd, #_cmd)) { \
-               if (!conf._cmd ## _given && cwt->state == CWS_NEED_HEADER) \
-                       return -E_BTR_NAVAIL; \
-               *result = make_message("%d", cwt->state == CWS_NO_HEADER || conf._cmd ## _given? \
-                       conf._cmd ## _arg : cwt->_cmd); \
-               return 1; \
-       } \
-
-
-static int check_wav_exec(struct btr_node *btrn, const char *cmd, char **result)
-{
-       struct check_wav_task *cwt = btr_context(btrn);
-
-       HANDLE_EXEC(sample_rate);
-       HANDLE_EXEC(channels);
-       HANDLE_EXEC(sample_format);
-       return -ERRNO_TO_PARA_ERROR(ENOTSUP);
-}
-
-static void check_wav_post_select(__a_unused struct sched *s, struct task *t)
-{
-       struct check_wav_task *cwt = container_of(t, struct check_wav_task, task);
-       struct btr_node *btrn = cwt->btrn;
-       unsigned char *a;
-       size_t sz;
-       int ret;
-       uint16_t bps; /* bits per sample */
-       const char *sample_formats[] = {SAMPLE_FORMATS};
-
-       t->error = 0;
-       ret = btr_node_status(btrn, cwt->min_iqs, BTR_NT_INTERNAL);
-       if (ret <= 0)
-               goto out;
-       if (cwt->state != CWS_NEED_HEADER)
-               goto pushdown;
-       btr_merge(btrn, cwt->min_iqs);
-       sz = btr_next_buffer(btrn, (char **)&a);
-       if (sz < cwt->min_iqs) /* file size less than WAV_HEADER_SIZE */
-               goto pushdown;
-       cwt->min_iqs = 0;
-       /*
-        * The default byte ordering assumed for WAVE data files is
-        * little-endian. Files written using the big-endian byte ordering
-        * scheme have the identifier RIFX instead of RIFF.
-        */
-       if (a[0] != 'R' || a[1] != 'I' || a[2] != 'F' ||
-                       (a[3] != 'F' && a[3] != 'X')) {
-               PARA_NOTICE_LOG("wav header not found\n");
-               cwt->state = CWS_NO_HEADER;
-               sprintf(t->status, "check wav: no header");
-               goto out;
-       }
-       PARA_INFO_LOG("found wav header\n");
-       cwt->state = CWS_HAVE_HEADER;
-       sprintf(t->status, "check wav: have header");
-       cwt->channels = (unsigned) a[22];
-       cwt->sample_rate = a[24] + (a[25] << 8) + (a[26] << 16) + (a[27] << 24);
-       bps = a[34] + ((unsigned)a[35] << 8);
-       if (bps != 8 && bps != 16) {
-               PARA_WARNING_LOG("%u bps not supported, assuming 16\n", bps);
-               bps = 16;
-       }
-       /*
-        * 8-bit samples are stored as unsigned bytes, ranging from 0 to 255.
-        * 16-bit samples are stored as 2's-complement signed integers, ranging
-        * from -32768 to 32767.
-        */
-       if (bps == 8)
-               cwt->sample_format = SF_U8;
-       else
-               cwt->sample_format = (a[3] == 'F')? SF_S16_LE : SF_S16_BE;
-       PARA_NOTICE_LOG("%dHz, %s, %s\n", cwt->sample_rate,
-               cwt->channels == 1? "mono" : "stereo",
-               sample_formats[cwt->sample_format]);
-       btr_consume(btrn, WAV_HEADER_LEN);
-pushdown:
-       btr_pushdown(btrn);
-out:
-       t->error = ret;
-       if (ret < 0)
-               btr_remove_node(btrn);
-}
-
 static int loglevel;
 INIT_STDERR_LOGGING(loglevel)
 
 __noreturn static void print_help_and_die(void)
 {
-       int d = conf.detailed_help_given;
-       const char **p = d? write_args_info_detailed_help
-               : write_args_info_help;
+       struct ggo_help h = DEFINE_GGO_HELP(write);
+       bool d = conf.detailed_help_given;
 
-       printf_or_die("%s\n\n", WRITE_CMDLINE_PARSER_PACKAGE "-"
-               WRITE_CMDLINE_PARSER_VERSION);
-       printf_or_die("%s\n\n", write_args_info_usage);
-       for (; *p; p++)
-               printf_or_die("%s\n", *p);
-       print_writer_helps(d);
+       ggo_print_help(&h, d? GPH_STANDARD_FLAGS_DETAILED : GPH_STANDARD_FLAGS);
+       print_writer_helps(d? GPH_MODULE_FLAGS_DETAILED : GPH_MODULE_FLAGS);
        exit(0);
 }
 
@@ -187,47 +66,56 @@ __noreturn static void print_help_and_die(void)
 static void setup_writer_node(const char *arg, struct btr_node *parent,
                struct writer_node *wn, struct sched *s)
 {
-       if (arg)
-               wn->conf = check_writer_arg_or_die(arg, &wn->writer_num);
-       else {
-               wn->writer_num = DEFAULT_WRITER;
-               wn->conf = writers[DEFAULT_WRITER].parse_config_or_die("");
-       }
+       wn->conf = check_writer_arg_or_die(arg, &wn->writer_num);
        register_writer_node(wn, parent, s);
 }
 
+struct write_task {
+       struct task *task;
+       struct check_wav_context *cwc;
+};
+
+static void write_pre_select(struct sched *s, void *context)
+{
+       struct write_task *wt = context;
+       check_wav_pre_select(s, wt->cwc);
+}
+
+static int write_post_select(__a_unused struct sched *s, void *context)
+{
+       struct write_task *wt = context;
+       return check_wav_post_select(wt->cwc);
+}
+
 static int setup_and_schedule(void)
 {
        int i, ret;
-       struct check_wav_task _cwt, *cwt = &_cwt;
+       struct btr_node *cw_btrn;
        struct writer_node *wns;
        static struct sched s;
+       struct wav_params wp;
+       struct write_task wt;
 
-       loglevel = get_loglevel_by_name(conf.loglevel_arg);
        sit.btrn = btr_new_node(&(struct btr_node_description)
                EMBRACE(.name = "stdin"));
-       stdin_set_defaults(&sit);
-       register_task(&s, &sit.task);
-
-       cwt->state = CWS_NEED_HEADER;
-       cwt->min_iqs = WAV_HEADER_LEN;
-       cwt->btrn = btr_new_node(&(struct btr_node_description)
-               EMBRACE(.name = "check_wav", .parent = sit.btrn,
-               .handler = check_wav_exec, .context = cwt));
-       sprintf(cwt->task.status, "check_wav");
-       cwt->task.pre_select = check_wav_pre_select;
-       cwt->task.post_select = check_wav_post_select;
-       cwt->task.error = 0;
-       register_task(&s, &cwt->task);
-
+       stdin_task_register(&sit, &s);
+
+       COPY_WAV_PARMS(&wp, &conf);
+       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);
        if (!conf.writer_given) {
                wns = para_calloc(sizeof(*wns));
-               setup_writer_node(NULL, cwt->btrn, wns, &s);
+               setup_writer_node(NULL, cw_btrn, wns, &s);
                i = 1;
        } else {
                wns = para_calloc(conf.writer_given * sizeof(*wns));
                for (i = 0; i < conf.writer_given; i++)
-                       setup_writer_node(conf.writer_arg[i], cwt->btrn,
+                       setup_writer_node(conf.writer_arg[i], cw_btrn,
                                wns + i, &s);
        }
 
@@ -235,16 +123,17 @@ static int setup_and_schedule(void)
        s.default_timeout.tv_usec = 50000;
        ret = schedule(&s);
        if (ret >= 0) {
-               int j;
+               int j, ts;
                for (j = 0; j < i; j++) {
-                       struct task *t = &wns[j].task;
-                       assert(t->error < 0);
-                       if (t->error != -E_WRITE_COMMON_EOF
-                                       && t->error != -E_BTR_EOF) {
-                               PARA_ERROR_LOG("%s: %s\n", t->status,
-                                       para_strerror(-t->error));
+                       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_names[wn->writer_num];
+                               PARA_ERROR_LOG("%s: %s\n", name,
+                                       para_strerror(-ts));
                                if (ret >= 0)
-                                       ret = t->error;
+                                       ret = ts;
                        }
                }
        }
@@ -253,12 +142,13 @@ static int setup_and_schedule(void)
                struct writer *w = writers + wn->writer_num;
 
                w->close(wn);
-               btr_free_node(wn->btrn);
+               btr_remove_node(&wn->btrn);
                w->free_config(wn->conf);
                free(wn->conf);
        }
        free(wns);
-       btr_free_node(cwt->btrn);
+       check_wav_shutdown(wt.cwc);
+       sched_shutdown(&s);
        return ret;
 }
 
@@ -277,9 +167,10 @@ int main(int argc, char *argv[])
 {
        int ret;
 
-       writer_init();
        write_cmdline_parser(argc, argv, &conf);
-       HANDLE_VERSION_FLAG("write", conf);
+       loglevel = get_loglevel_by_name(conf.loglevel_arg);
+       writer_init();
+       version_handle_flag("write", conf.version_given);
        if (conf.help_given || conf.detailed_help_given)
                print_help_and_die();