X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=alsa_write.c;h=1c168e7b4b037f8e8853681e02254879f0912640;hp=c2a4cc1e94f47d9cf9717334059e6cf57df4970a;hb=de2a0b8fa6c9f7dbee01ef989c4ca1f450a7af8b;hpb=d7b4aa3835197ee906f13f515040e1cda6385544

diff --git a/alsa_write.c b/alsa_write.c
index c2a4cc1e..1c168e7b 100644
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -145,14 +145,15 @@ 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)
+	if (!pad)
 		return sched_min_delay(s);
+	if (ret < 0)
+		return sched_request_barrier_or_min_delay(&pad->drain_barrier, s);
 	/*
 	 * Data is available to be written to the alsa handle.  Compute number
 	 * of milliseconds until next buffer underrun would occur.
@@ -171,8 +172,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)