Merge commit 'remotes/yangtse/master'

[paraslash.git] / alsa_write.c

diff --git a/alsa_write.c b/alsa_write.c
index 6f92612a2221c5bf132b786f9fd67a9872c777cd..faadec1f673b5064465bf6151fcaa12990098359 100644 (file)
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -12,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"
 


@@ -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) {
                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);
+       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);
        tv_add(now, &tv, &pad->next_chunk);

-       wn->written += ret * pad->bytes_per_frame;

        return 1;
 }
 
        return 1;
 }