gui: Check return value of para_exec_cmdline_pid().
[paraslash.git] / write.c
diff --git a/write.c b/write.c
index 34cea48..a8e2429 100644 (file)
--- a/write.c
+++ b/write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
 
 #include "para.h"
 #include "string.h"
 #include "sched.h"
 #include "ggo.h"
 #include "stdin.h"
+#include "buffer_tree.h"
 #include "write.h"
 #include "write_common.h"
 #include "fd.h"
 #include "error.h"
+#include "version.h"
 
 INIT_WRITE_ERRLISTS;
 
-/** Check if given buffer contains a valid wave header. */
+enum check_wav_state {
+       CWS_NEED_HEADER,
+       CWS_HAVE_HEADER,
+       CWS_NO_HEADER,
+};
+
+/* Information extracted from the wav header. */
 struct check_wav_task {
-       /** The buffer to check. */
-       char *buf;
-       /** Number of bytes loaded in \a buf. */
-       size_t *loaded;
-       /** 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. */
+       int state;
+       /** Number of channels. */
        unsigned channels;
+       unsigned sample_format;
        /** Sample rate specified in wav header given by \a buf. */
-       unsigned samplerate;
+       unsigned sample_rate;
        /** The task structure used by the scheduler. */
        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;
+       struct btr_node *btrn;
+       size_t min_iqs;
 };
 
 static struct write_args_info conf;
 
 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.
- *
- * \return If not, return -E_NO_WAV_HEADER, otherwise, return zero. If
- * 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)
+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);
-       unsigned char *a;
        int ret;
 
-       if (*cwt->loaded < WAV_HEADER_LEN) {
-               if (*cwt->input_error < 0)
-                       t->error = *cwt->input_error;
-               return;
-       }
-       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;
+       ret = btr_node_status(cwt->btrn, cwt->min_iqs, BTR_NT_INTERNAL);
+       if (ret != 0)
+               sched_min_delay(s);
 }
 
-static void initial_delay_pre_select(struct sched *s, struct task *t)
+#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 initial_delay_task *idt = container_of(t, struct initial_delay_task, task);
-       struct timeval diff;
+       struct check_wav_task *cwt = btr_context(btrn);
 
-       if (!idt->start_time.tv_sec && !idt->start_time.tv_usec) {
-               t->error = -E_NO_DELAY;
-               goto register_check_wav;
-       }
-       if (tv_diff(now, &idt->start_time, &diff) > 0) {
-               t->error = -E_DELAY_TIMEOUT;
-               goto register_check_wav;
-       }
-       if (tv_diff(&s->timeout , &diff, NULL) > 0)
-               s->timeout = diff;
-       return;
-register_check_wav:
-       register_task(&the_check_wav_task.task);
-       s->timeout.tv_sec = 0;
-       s->timeout.tv_usec = 1;
+       HANDLE_EXEC(sample_rate);
+       HANDLE_EXEC(channels);
+       HANDLE_EXEC(sample_format);
+       return -ERRNO_TO_PARA_ERROR(ENOTSUP);
 }
 
-static int loglevel;
-INIT_STDERR_LOGGING(loglevel)
-
-static struct writer_node_group *check_args(void)
+static void check_wav_post_select(__a_unused struct sched *s, struct task *t)
 {
-       int i, ret = -E_WRITE_SYNTAX;
-       struct writer_node_group *g = NULL;
-       struct initial_delay_task *idt = &the_initial_delay_task;
+       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};
 
-       loglevel = get_loglevel_by_name(conf.loglevel_arg);
-       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;
-       }
-       if (!conf.writer_given) {
-               g = setup_default_wng();
-               ret = 1;
+       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;
        }
-       g = wng_new(conf.writer_given);
-       ret = -E_WRITE_SYNTAX;
-       for (i = 0; i < conf.writer_given; i++) {
-               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;
-               g->writer_nodes[i].writer_num = writer_num;
+       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;
        }
-       ret = 1;
+       /*
+        * 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:
-       if (ret > 0)
-               return g;
-       free(g);
-       return NULL;
+       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;
@@ -179,23 +164,118 @@ __noreturn static void print_help_and_die(void)
        exit(0);
 }
 
+/*
+ * Parse config and register a task for a writer node.
+ *
+ * \param arg Command line arguments.
+ * \param parent The new node will be a child of \a parent.
+ * \param wn The writer node.
+ *
+ * If arg is \p NULL, the OS-dependent default writer is used with no
+ * arguments.  The default writers are alsa for Linux, osx for OS X, oss for
+ * *BSD, and the file writer if the default writer is not supported.
+ *
+ * Once the writer configuration has been retrieved from the ->parse_config
+ * callback a writer node is created, its buffer tree node is added to the
+ * buffer tree as a child of the given parent.
+ *
+ * Finally, the new writer node's task structure is initialized and registered
+ * to the paraslash scheduler.
+ *
+ * \return Standard.
+ */
+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("");
+       }
+       register_writer_node(wn, parent, s);
+}
+
+static int setup_and_schedule(void)
+{
+       int i, ret;
+       struct check_wav_task _cwt, *cwt = &_cwt;
+       struct writer_node *wns;
+       static struct sched s;
+
+       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);
+
+       if (!conf.writer_given) {
+               wns = para_calloc(sizeof(*wns));
+               setup_writer_node(NULL, cwt->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,
+                               wns + i, &s);
+       }
+
+       s.default_timeout.tv_sec = 10;
+       s.default_timeout.tv_usec = 50000;
+       ret = schedule(&s);
+       if (ret >= 0) {
+               int j;
+               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));
+                               if (ret >= 0)
+                                       ret = t->error;
+                       }
+               }
+       }
+       for (i--; i >= 0; i--) {
+               struct writer_node *wn = wns + i;
+               struct writer *w = writers + wn->writer_num;
+
+               w->close(wn);
+               btr_free_node(wn->btrn);
+               w->free_config(wn->conf);
+               free(wn->conf);
+       }
+       free(wns);
+       btr_free_node(cwt->btrn);
+       return ret;
+}
+
 /**
  * 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.
+ * It sets up and starts the tasks and the buffer tree nodes determined by
+ * command line options.
  *
  * \return \p EXIT_SUCCESS or EXIT_FAILURE
  */
 int main(int argc, char *argv[])
 {
-       int ret = -E_WRITE_SYNTAX;
-       static struct sched s;
-       struct check_wav_task *cwt = &the_check_wav_task;
-       struct initial_delay_task *idt = &the_initial_delay_task;
+       int ret;
 
        writer_init();
        write_cmdline_parser(argc, argv, &conf);
@@ -203,39 +283,7 @@ int main(int argc, char *argv[])
        if (conf.help_given || conf.detailed_help_given)
                print_help_and_die();
 
-       wng = check_args();
-       if (!wng)
-               goto out;
-       stdin_set_defaults(&sit);
-       ret = -ERRNO_TO_PARA_ERROR(EINVAL);
-       if (conf.bufsize_arg < 0)
-               goto out;
-       if (conf.bufsize_arg >= INT_MAX / 1024)
-               goto out;
-       sit.bufsize = conf.bufsize_arg * 1024;
-       sit.buf = para_malloc(sit.bufsize);
-
-       wng->bufp = &sit.buf;
-       wng->loaded = &sit.loaded;
-       wng->input_error = &sit.task.error;
-
-       register_task(&sit.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;
-
-       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:
+       ret = setup_and_schedule();
        if (ret < 0) {
                PARA_ERROR_LOG("%s\n", para_strerror(-ret));
                exit(EXIT_FAILURE);