audioc: Switch to blocking file descriptors.

[paraslash.git] / alsa_write.c

diff --git a/alsa_write.c b/alsa_write.c
index 8bc12a90fa89fc6ec532fe3d61721a6369d8aee1..7a4b868d251f0ee780647f72457b1c3162549bf0 100644 (file)
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>

  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */


@@ -54,6 +54,7 @@ struct private_alsa_write_data {
         * decoder of the writer node group.
         */
        unsigned channels;
         * decoder of the writer node group.
         */
        unsigned channels;

+       struct timeval drain_barrier;

 };
 
 /* Install PCM software and hardware configuration. */
 };
 
 /* Install PCM software and hardware configuration. */


@@ -174,23 +175,6 @@ static void alsa_write_pre_select(struct sched *s, struct task *t)
                s->timeout = tv;
 }
 
                s->timeout = tv;
 }
 

-static void xrun(snd_pcm_t *handle)
-{
-       snd_pcm_status_t *status;
-       int ret;
-       struct timeval tv, diff;
-
-       snd_pcm_status_alloca(&status);
-       ret = snd_pcm_status(handle, status);
-       if (ret < 0)
-               return;
-       if (snd_pcm_status_get_state(status) != SND_PCM_STATE_XRUN)
-               return;
-       snd_pcm_status_get_trigger_tstamp(status, &tv);
-       tv_diff(now, &tv, &diff);
-       PARA_WARNING_LOG("underrun: %lums\n", tv2ms(&diff));
-}
-

 static void alsa_close(struct writer_node *wn)
 {
        struct private_alsa_write_data *pad = wn->private_data;
 static void alsa_close(struct writer_node *wn)
 {
        struct private_alsa_write_data *pad = wn->private_data;


@@ -217,7 +201,7 @@ static void alsa_write_post_select(__a_unused struct sched *s,
        struct btr_node *btrn = wn->btrn;
        char *data;
        size_t bytes;
        struct btr_node *btrn = wn->btrn;
        char *data;
        size_t bytes;

-       snd_pcm_sframes_t frames, avail;
+       snd_pcm_sframes_t frames;

        int ret;
 
 again:
        int ret;
 
 again:


@@ -233,10 +217,14 @@ again:
                if (!pad->handle)
                        goto err;
                /* wait until pending frames are played */
                if (!pad->handle)
                        goto err;
                /* wait until pending frames are played */

-               avail = snd_pcm_avail_update(pad->handle);
-               if (avail + 1000 > pad->buffer_frames)
+               if (pad->drain_barrier.tv_sec == 0) {
+                       PARA_DEBUG_LOG("waiting for device to drain\n");
+                       tv_add(now, &(struct timeval)EMBRACE(0, 200 * 1000),
+                               &pad->drain_barrier);
+                       return;
+               }
+               if (tv_diff(now, &pad->drain_barrier, NULL) > 0)

                        goto err;
                        goto err;

-               PARA_DEBUG_LOG("waiting for device to drain\n");

                return;
        }
        if (!pad->handle) {
                return;
        }
        if (!pad->handle) {


@@ -269,7 +257,7 @@ again:
                goto again;
        }
        if (frames == -EPIPE) {
                goto again;
        }
        if (frames == -EPIPE) {

-               xrun(pad->handle);
+               PARA_WARNING_LOG("underrun (tried to write %zu bytes)\n", bytes);

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


@@ -310,7 +298,7 @@ static void alsa_free_config(void *conf)
  *
  * \param w Pointer to the writer to initialize.
  *
  *
  * \param w Pointer to the writer to initialize.
  *

- * \sa \ref struct writer.
+ * \sa struct \ref writer.

  */
 void alsa_write_init(struct writer *w)
 {
  */
 void alsa_write_init(struct writer *w)
 {