Remove autogenerated doxygen comments for commands.

[paraslash.git] / alsa_write.c

diff --git a/alsa_write.c b/alsa_write.c
index d115a52db0ae899be1ec003d4f7e060611b0ee94..8cf5cfd25bf3909e0f4d338d2397ca0e017c29ab 100644 (file)
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -35,7 +35,7 @@
 struct private_alsa_write_data {
        /** The alsa handle */
        snd_pcm_t *handle;
-       /** Determined and set by alsa_open(). */
+       /** Determined and set by alsa_init(). */
        int bytes_per_frame;
        /** The approximate maximum buffer duration in us. */
        unsigned buffer_time;
@@ -142,28 +142,18 @@ static int alsa_init(struct private_alsa_write_data *pad,
        return 1;
 }
 
-/* Open an instance of the alsa writer. */
-static int alsa_open(struct writer_node *wn)
-{
-       wn->private_data = para_calloc(sizeof(struct private_alsa_write_data));
-       return 1;
-}
-
 static void alsa_write_pre_select(struct sched *s, struct task *t)
 {
        struct writer_node *wn = container_of(t, struct writer_node, task);
        struct private_alsa_write_data *pad = wn->private_data;
        struct timeval tv;
        snd_pcm_sframes_t avail, underrun;
-       int ret;
+       int ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
 
-       if (!pad->handle)
-               return;
-       ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
-       if (ret < 0)
-               sched_request_timeout_ms(20, s);
-       if (ret <= 0)
+       if (ret == 0)
                return;
+       if (ret < 0 || !pad)
+               return sched_min_delay(s);
        /*
         * Data is available to be written to the alsa handle.  Compute number
         * of milliseconds until next buffer underrun would occur.
@@ -183,8 +173,7 @@ static void alsa_write_pre_select(struct sched *s, struct task *t)
                underrun = 50;
        underrun -= 50;
        ms2tv(underrun, &tv);
-       if (tv_diff(&s->timeout, &tv, NULL) > 0)
-               s->timeout = tv;
+       sched_request_timeout(&tv, s);
 }
 
 static void alsa_close(struct writer_node *wn)
@@ -192,16 +181,16 @@ static void alsa_close(struct writer_node *wn)
        struct private_alsa_write_data *pad = wn->private_data;
        PARA_INFO_LOG("closing writer node %p\n", wn);
 
-       if (pad->handle) {
-               /*
-                * It's OK to have a blocking operation here because we already
-                * made sure that the PCM output buffer is (nearly) empty.
-                */
-               snd_pcm_nonblock(pad->handle, 0);
-               snd_pcm_drain(pad->handle);
-               snd_pcm_close(pad->handle);
-               snd_config_update_free_global();
-       }
+       if (!pad)
+               return;
+       /*
+        * It's OK to have a blocking operation here because we already made
+        * sure that the PCM output buffer is (nearly) empty.
+        */
+       snd_pcm_nonblock(pad->handle, 0);
+       snd_pcm_drain(pad->handle);
+       snd_pcm_close(pad->handle);
+       snd_config_update_free_global();
        free(pad);
 }
 
@@ -223,10 +212,10 @@ again:
                return;
        btr_merge(btrn, wn->min_iqs);
        bytes = btr_next_buffer(btrn, &data);
-       if (ret < 0 || bytes < pad->bytes_per_frame) { /* eof */
+       if (ret < 0 || bytes < wn->min_iqs) { /* eof */
                assert(btr_no_parent(btrn));
-               ret = -E_ALSA_EOF;
-               if (!pad->handle)
+               ret = -E_WRITE_COMMON_EOF;
+               if (!pad)
                        goto err;
                /* wait until pending frames are played */
                if (pad->drain_barrier.tv_sec == 0) {
@@ -239,11 +228,12 @@ again:
                        goto err;
                return;
        }
-       if (!pad->handle) {
+       if (!pad) {
                int32_t val;
 
                if (bytes == 0) /* no data available */
                        return;
+               pad = para_calloc(sizeof(*pad));
                get_btr_sample_rate(btrn, &val);
                pad->sample_rate = val;
                get_btr_channels(btrn, &val);
@@ -254,8 +244,11 @@ again:
                PARA_INFO_LOG("%d channel(s), %dHz\n", pad->channels,
                        pad->sample_rate);
                ret = alsa_init(pad, wn->conf);
-               if (ret < 0)
+               if (ret < 0) {
+                       free(pad);
                        goto err;
+               }
+               wn->private_data = pad;
                wn->min_iqs = pad->bytes_per_frame;
                goto again;
        }
@@ -280,21 +273,14 @@ err:
        t->error = ret;
 }
 
-__malloc static void *alsa_parse_config(const char *options)
+__malloc static void *alsa_parse_config_or_die(const char *options)
 {
-       int ret;
-       struct alsa_write_args_info *conf
-               = para_calloc(sizeof(struct alsa_write_args_info));
+       struct alsa_write_args_info *conf = para_calloc(sizeof(*conf));
 
        PARA_INFO_LOG("options: %s, %zd\n", options, strcspn(options, " \t"));
-       ret = alsa_cmdline_parser_string(options, conf, "alsa_write");
-       if (ret)
-               goto err_out;
-       PARA_INFO_LOG("help given: %d\n", conf->help_given);
+       /* exits on errors */
+       alsa_cmdline_parser_string(options, conf, "alsa_write");
        return conf;
-err_out:
-       free(conf);
-       return NULL;
 }
 
 static void alsa_free_config(void *conf)
@@ -314,11 +300,10 @@ void alsa_write_init(struct writer *w)
        struct alsa_write_args_info dummy;
 
        alsa_cmdline_parser_init(&dummy);
-       w->open = alsa_open;
        w->close = alsa_close;
        w->pre_select = alsa_write_pre_select;
        w->post_select = alsa_write_post_select;
-       w->parse_config = alsa_parse_config;
+       w->parse_config_or_die = alsa_parse_config_or_die;
        w->shutdown = NULL; /* nothing to do */
        w->free_config = alsa_free_config;
        w->help = (struct ggo_help) {