Remove autogenerated doxygen comments for commands.

[paraslash.git] / alsa_write.c

diff --git a/alsa_write.c b/alsa_write.c
index 8676a451a85fd36edf1625d651a22ddfd3436537..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.
  */
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */


@@ -214,7 +214,7 @@ again:
        bytes = btr_next_buffer(btrn, &data);
        if (ret < 0 || bytes < wn->min_iqs) { /* eof */
                assert(btr_no_parent(btrn));
        bytes = btr_next_buffer(btrn, &data);
        if (ret < 0 || bytes < wn->min_iqs) { /* eof */
                assert(btr_no_parent(btrn));

-               ret = -E_ALSA_EOF;
+               ret = -E_WRITE_COMMON_EOF;

                if (!pad)
                        goto err;
                /* wait until pending frames are played */
                if (!pad)
                        goto err;
                /* wait until pending frames are played */


@@ -231,10 +231,9 @@ again:
        if (!pad) {
                int32_t val;
 
        if (!pad) {
                int32_t val;
 

-               pad = para_calloc(sizeof(*pad));
-               wn->private_data = pad;

                if (bytes == 0) /* no data available */
                        return;
                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);
                get_btr_sample_rate(btrn, &val);
                pad->sample_rate = val;
                get_btr_channels(btrn, &val);


@@ -245,8 +244,11 @@ again:
                PARA_INFO_LOG("%d channel(s), %dHz\n", pad->channels,
                        pad->sample_rate);
                ret = alsa_init(pad, wn->conf);
                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;
                        goto err;

+               }
+               wn->private_data = pad;

                wn->min_iqs = pad->bytes_per_frame;
                goto again;
        }
                wn->min_iqs = pad->bytes_per_frame;
                goto again;
        }