doxify acl.c.

[paraslash.git] / alsa_write.c

diff --git a/alsa_write.c b/alsa_write.c
index 6f92612a2221c5bf132b786f9fd67a9872c777cd..e228069909a9fef7eae3683dc32bef0f5bb54d5d 100644 (file)
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -12,15 +12,16 @@
  * 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"
 
@@ -175,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;
        }
@@ -183,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;
 }