X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=alsa_write.c;h=34a71f9bd34b503fafdbb192d5479c1815846b49;hp=8cf5cfd25bf3909e0f4d338d2397ca0e017c29ab;hb=3d6ca6e3ae198017164e544c59d622b11a5afdde;hpb=e6cab9cf4badec449aebef40d47078201a52f48a

diff --git a/alsa_write.c b/alsa_write.c
index 8cf5cfd2..34a71f9b 100644
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -14,7 +14,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
 #include <alsa/asoundlib.h>
 #include <sys/time.h>
 #include <stdbool.h>
@@ -146,14 +145,19 @@ static void alsa_write_pre_select(struct sched *s, struct task *t)
 {
 	struct writer_node *wn = container_of(t, struct writer_node, task);
 	struct private_alsa_write_data *pad = wn->private_data;
-	struct timeval tv;
 	snd_pcm_sframes_t avail, underrun;
 	int ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
 
 	if (ret == 0)
 		return;
-	if (ret < 0 || !pad)
-		return sched_min_delay(s);
+	if (!pad) {
+		sched_min_delay(s);
+		return;
+	}
+	if (ret < 0) {
+		sched_request_barrier_or_min_delay(&pad->drain_barrier, s);
+		return;
+	}
 	/*
 	 * Data is available to be written to the alsa handle.  Compute number
 	 * of milliseconds until next buffer underrun would occur.
@@ -172,8 +176,7 @@ static void alsa_write_pre_select(struct sched *s, struct task *t)
 	if (underrun < 50)
 		underrun = 50;
 	underrun -= 50;
-	ms2tv(underrun, &tv);
-	sched_request_timeout(&tv, s);
+	sched_request_timeout_ms(underrun, s);
 }
 
 static void alsa_close(struct writer_node *wn)
@@ -254,7 +257,9 @@ again:
 	}
 	frames = bytes / pad->bytes_per_frame;
 	frames = snd_pcm_writei(pad->handle, data, frames);
-	if (frames >= 0) {
+	if (frames == 0 || frames == -EAGAIN)
+		return;
+	if (frames > 0) {
 		btr_consume(btrn, frames * pad->bytes_per_frame);
 		goto again;
 	}
@@ -263,8 +268,6 @@ again:
 		snd_pcm_prepare(pad->handle);
 		return;
 	}
-	if (frames == -EAGAIN)
-		return;
 	PARA_WARNING_LOG("%s\n", snd_strerror(-frames));
 	ret = -E_ALSA_WRITE;
 err: