From: Andre Noll <maan@systemlinux.org>
Date: Tue, 25 Nov 2008 23:27:55 +0000 (+0100)
Subject: alsa: Improve chunk timings.
X-Git-Tag: v0.3.3~20
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=2d945f96dcd02bcabd02a79342712e089ed30c98;p=paraslash.git

alsa: Improve chunk timings.

And get rid of magic constants.
---

diff --git a/alsa_write.c b/alsa_write.c
index 8e8b693c..91638156 100644
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -186,14 +186,16 @@ static int alsa_write_post_select(__a_unused struct sched *s,
 			frames, (int)ret);
 		return -E_ALSA_WRITE;
 	}
-	if (ret == -EAGAIN) { /* try again in 5ms */
-		PARA_WARNING_LOG("EAGAIN\n");
-		ms2tv(5, &tv);
-	} else {
+	if (ret == -EAGAIN)
+		PARA_DEBUG_LOG("EAGAIN\n");
+	else
 		wn->written += ret * pad->bytes_per_frame;
-		ms2tv(pad->buffer_time / 4000, &tv);
+	if (ret == frames) /* we wrote everything, try again immediately */
+		pad->next_chunk	= *now;
+	else {
+		ms2tv(pad->buffer_time / pad->bytes_per_frame / 1000, &tv);
+		tv_add(now, &tv, &pad->next_chunk);
 	}
-	tv_add(now, &tv, &pad->next_chunk);
 	return 1;
 }