X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=alsa_write.c;h=e228069909a9fef7eae3683dc32bef0f5bb54d5d;hp=3ad8f5dfe84c5e93dfdd9e2d8d81e3fa7f7c7d22;hb=73aebb78da7297053f41dba5b3f0cefb33ad248e;hpb=2c679eeb8bbc93220f85403eca6e9380dc624a6a

diff --git a/alsa_write.c b/alsa_write.c
index 3ad8f5df..e2280699 100644
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -176,7 +176,7 @@ static int alsa_write_post_select(__a_unused struct sched *s,
 
 //	PARA_INFO_LOG("%zd frames\n", frames);
 	if (!frames) {
-		if (*wng->input_eof)
+		if (*wng->input_error)
 			wn->written = *wng->loaded;
 		return 1;
 	}
@@ -184,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) {
-		PARA_WARNING_LOG("%s", "EPIPE\n");
+		PARA_WARNING_LOG("EPIPE\n");
 		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;
 	}
-	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;
 }