Fix a gcc warning in alsa_open() on x86_64.

[paraslash.git] / alsa_write.c

diff --git a/alsa_write.c b/alsa_write.c
index 8bac583a92306b097f0982447e62cdfc946d51d1..cfae4fb9e20b322e36764d92806ba9f842ed1b0a 100644 (file)
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -1,19 +1,7 @@
 /*
 /*

- * Copyright (C) 2005-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2008 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
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.

  */
 
 /** \file alsa_write.c paraslash's alsa output plugin */
  */
 
 /** \file alsa_write.c paraslash's alsa output plugin */


@@ -24,15 +12,16 @@
  * based on the vplay program by Michael Beck.
  */
 
  * based on the vplay program by Michael Beck.
  */
 

+#include <sys/types.h>
+#include <dirent.h>
+#include <alsa/asoundlib.h>
+

 #include "para.h"
 #include "fd.h"
 #include "string.h"
 #include "list.h"
 #include "sched.h"
 #include "write.h"
 #include "para.h"
 #include "fd.h"
 #include "string.h"
 #include "list.h"
 #include "sched.h"
 #include "write.h"

-
-#include <alsa/asoundlib.h>
-

 #include "alsa_write.cmdline.h"
 #include "error.h"
 
 #include "alsa_write.cmdline.h"
 #include "error.h"
 


@@ -52,7 +41,7 @@ struct private_alsa_write_data {
        /**
         * the samplerate given by command line option or the decoder
         * of the writer node group
        /**
         * the samplerate given by command line option or the decoder
         * of the writer node group

-        */
+        */

        unsigned samplerate;
        /**
         * the number of channels, also given by command line option or the
        unsigned samplerate;
        /**
         * the number of channels, also given by command line option or the


@@ -70,8 +59,7 @@ static int alsa_open(struct writer_node *w)
 {
        snd_pcm_hw_params_t *hwparams;
        snd_pcm_sw_params_t *swparams;
 {
        snd_pcm_hw_params_t *hwparams;
        snd_pcm_sw_params_t *swparams;

-       snd_pcm_uframes_t buffer_size, xfer_align, start_threshold,
-               stop_threshold;
+       snd_pcm_uframes_t buffer_size, start_threshold, stop_threshold;

        int err;
        snd_pcm_info_t *info;
        snd_pcm_uframes_t period_size;
        int err;
        snd_pcm_info_t *info;
        snd_pcm_uframes_t period_size;


@@ -129,14 +117,11 @@ static int alsa_open(struct writer_node *w)
        if (period_size == buffer_size)
                return -E_BAD_PERIOD;
        snd_pcm_sw_params_current(pad->handle, swparams);
        if (period_size == buffer_size)
                return -E_BAD_PERIOD;
        snd_pcm_sw_params_current(pad->handle, swparams);

-       err = snd_pcm_sw_params_get_xfer_align(swparams, &xfer_align);
-       if (err < 0 || !xfer_align)
-               return -E_GET_XFER;

        snd_pcm_sw_params_set_avail_min(pad->handle, swparams, period_size);
        snd_pcm_sw_params_set_avail_min(pad->handle, swparams, period_size);

-       /* round to closest transfer boundary */
-       start_threshold = (buffer_size / xfer_align) * xfer_align;
-       if (start_threshold < 1)
+       if (buffer_size < 1)

                start_threshold = 1;
                start_threshold = 1;

+       else
+               start_threshold = buffer_size;

        if (snd_pcm_sw_params_set_start_threshold(pad->handle, swparams,
                        start_threshold) < 0)
                return -E_START_THRESHOLD;
        if (snd_pcm_sw_params_set_start_threshold(pad->handle, swparams,
                        start_threshold) < 0)
                return -E_START_THRESHOLD;


@@ -144,15 +129,13 @@ static int alsa_open(struct writer_node *w)
        if (snd_pcm_sw_params_set_stop_threshold(pad->handle, swparams,
                        stop_threshold) < 0)
                return -E_STOP_THRESHOLD;
        if (snd_pcm_sw_params_set_stop_threshold(pad->handle, swparams,
                        stop_threshold) < 0)
                return -E_STOP_THRESHOLD;

-       if (snd_pcm_sw_params_set_xfer_align(pad->handle, swparams,
-                       xfer_align) < 0)
-               return -E_SET_XFER;

        if (snd_pcm_sw_params(pad->handle, swparams) < 0)
                return -E_SW_PARAMS;
        pad->bytes_per_frame = snd_pcm_format_physical_width(FORMAT)
                * pad->channels / 8;
        if (snd_pcm_sw_params(pad->handle, swparams) < 0)
                return -E_SW_PARAMS;
        pad->bytes_per_frame = snd_pcm_format_physical_width(FORMAT)
                * pad->channels / 8;

+       PARA_INFO_LOG("bytes per frame: %zu\n", pad->bytes_per_frame);

        if (snd_pcm_nonblock(pad->handle, 1))
        if (snd_pcm_nonblock(pad->handle, 1))

-               PARA_ERROR_LOG("%s\n", "failed to set nonblock mode");
+               PARA_ERROR_LOG("failed to set nonblock mode\n");

        return period_size * pad->bytes_per_frame;
 }
 
        return period_size * pad->bytes_per_frame;
 }
 


@@ -187,7 +170,7 @@ static int alsa_write_post_select(__a_unused struct sched *s,
 
 //     PARA_INFO_LOG("%zd frames\n", frames);
        if (!frames) {
 
 //     PARA_INFO_LOG("%zd frames\n", frames);
        if (!frames) {

-               if (*wng->input_eof)
+               if (*wng->input_error)

                        wn->written = *wng->loaded;
                return 1;
        }
                        wn->written = *wng->loaded;
                return 1;
        }


@@ -195,18 +178,25 @@ static int alsa_write_post_select(__a_unused struct sched *s,
                return 1;
        ret = snd_pcm_writei(pad->handle, data, frames);
        if (ret == -EPIPE) {
                return 1;
        ret = snd_pcm_writei(pad->handle, data, frames);
        if (ret == -EPIPE) {

-               PARA_WARNING_LOG("%s", "EPIPE\n");
+               PARA_WARNING_LOG("EPIPE\n");

                snd_pcm_prepare(pad->handle);
                return 1;
        }
                snd_pcm_prepare(pad->handle);
                return 1;
        }

-       if (ret < 0) {
-               PARA_WARNING_LOG("%s", "ALSA ERROR\n");
+       if (ret < 0 && ret != -EAGAIN) {
+               PARA_WARNING_LOG("alsa error (%zu frames, ret = %d\n",
+                       frames, (int)ret);

                return -E_ALSA_WRITE;
        }
                return -E_ALSA_WRITE;
        }

-       ms2tv(pad->buffer_time / 4000, &tv);
-//     ms2tv(1, &tv);
-       tv_add(now, &tv, &pad->next_chunk);
-       wn->written += ret * pad->bytes_per_frame;
+       if (ret == -EAGAIN)
+               PARA_DEBUG_LOG("EAGAIN\n");
+       else
+               wn->written += ret * pad->bytes_per_frame;
+       if (ret == frames) /* we wrote everything, try again immediately */
+               pad->next_chunk = *now;
+       else {
+               ms2tv(pad->buffer_time / pad->bytes_per_frame / 1000, &tv);
+               tv_add(now, &tv, &pad->next_chunk);
+       }

        return 1;
 }
 
        return 1;
 }