From: Andre Noll <maan@systemlinux.org>
Date: Thu, 6 Dec 2007 21:12:03 +0000 (+0100)
Subject: alsa_write.c: Don't abort on EAGAIN.
X-Git-Tag: v0.3.0~66
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=d062b0c045134ad325ba2c92673dcc11ca781621;p=paraslash.git

alsa_write.c: Don't abort on EAGAIN.

Just retry a bit later.
---

diff --git a/alsa_write.c b/alsa_write.c
index fab886ca..faadec1f 100644
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -188,15 +188,19 @@ static int alsa_write_post_select(__a_unused struct sched *s,
 		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;
 	}
-	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;
 }