Replace eof by error in receivers/filters/writers.

[paraslash.git] / alsa_write.c

diff --git a/alsa_write.c b/alsa_write.c
index 7c090c899915cf454abad3c459dc45f0973239f8..c856ef4a2d23d256015028a89131fb19824f9a26 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-2007 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 */
@@ -24,19 +12,20 @@
  * 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 <alsa/asoundlib.h>
-
 #include "alsa_write.cmdline.h"
 #include "error.h"
 
-
+/** always use 16 bit little endian */
 #define FORMAT SND_PCM_FORMAT_S16_LE
 
 /** data specific to the alsa writer */
@@ -49,7 +38,15 @@ struct private_alsa_write_data {
        struct timeval next_chunk;
        /** the return value of snd_pcm_hw_params_get_buffer_time_max() */
        unsigned buffer_time;
+       /**
+        * 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
+        * decoder of the writer node group
+        */
        unsigned channels;
 };
 
@@ -179,7 +176,7 @@ static int alsa_write_post_select(__a_unused struct sched *s,
 
 //     PARA_INFO_LOG("%zd frames\n", frames);
        if (!frames) {
-               if (*wng->input_eof)
+               if (*wng->input_error)
                        wn->written = *wng->loaded;
                return 1;
        }
@@ -187,18 +184,23 @@ static int alsa_write_post_select(__a_unused struct sched *s,
                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;
        }
-       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;
        }
-       ms2tv(pad->buffer_time / 4000, &tv);
-//     ms2tv(1, &tv);
+       if (ret == -EAGAIN) { /* try again in 5ms */
+               PARA_WARNING_LOG("EAGAIN\n");
+               ms2tv(5, &tv);
+       } else {
+               wn->written += ret * pad->bytes_per_frame;
+               ms2tv(pad->buffer_time / 4000, &tv);
+       }
        tv_add(now, &tv, &pad->next_chunk);
-       wn->written += ret * pad->bytes_per_frame;
        return 1;
 }
 
@@ -227,7 +229,13 @@ err_out:
        return NULL;
 }
 
-/** the init function of the alsa writer */
+/**
+ * the init function of the alsa writer
+ *
+ * \param w pointer to the writer to initialize
+ *
+ * \sa struct writer
+ */
 void alsa_write_init(struct writer *w)
 {
        w->open = alsa_open;