01_DCCP_shutdown-unnecessary.diff

[paraslash.git] / alsa_write.c

diff --git a/alsa_write.c b/alsa_write.c
index fab886c..c856ef4 100644 (file)
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -176,7 +176,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;
        }


@@ -188,15 +188,19 @@ static int alsa_write_post_select(__a_unused struct sched *s,
                snd_pcm_prepare(pad->handle);
                return 1;
        }
                snd_pcm_prepare(pad->handle);
                return 1;
        }

-       if (ret < 0) {
+       if (ret < 0 && ret != -EAGAIN) {

                PARA_WARNING_LOG("alsa error (%zu frames, ret = %d\n",
                        frames, (int)ret);
                return -E_ALSA_WRITE;
        }
                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);
        tv_add(now, &tv, &pad->next_chunk);

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

        return 1;
 }
 
        return 1;
 }