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

diff --git a/alsa_write.c b/alsa_write.c
index d6493418..1c168e7b 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,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.
@@ -172,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)
@@ -214,7 +213,7 @@ again:
 	bytes = btr_next_buffer(btrn, &data);
 	if (ret < 0 || bytes < wn->min_iqs) { /* eof */
 		assert(btr_no_parent(btrn));
-		ret = -E_ALSA_EOF;
+		ret = -E_WRITE_COMMON_EOF;
 		if (!pad)
 			goto err;
 		/* wait until pending frames are played */
@@ -231,10 +230,9 @@ again:
 	if (!pad) {
 		int32_t val;
 
-		pad = para_calloc(sizeof(*pad));
-		wn->private_data = pad;
 		if (bytes == 0) /* no data available */
 			return;
+		pad = para_calloc(sizeof(*pad));
 		get_btr_sample_rate(btrn, &val);
 		pad->sample_rate = val;
 		get_btr_channels(btrn, &val);
@@ -245,8 +243,11 @@ again:
 		PARA_INFO_LOG("%d channel(s), %dHz\n", pad->channels,
 			pad->sample_rate);
 		ret = alsa_init(pad, wn->conf);
-		if (ret < 0)
+		if (ret < 0) {
+			free(pad);
 			goto err;
+		}
+		wn->private_data = pad;
 		wn->min_iqs = pad->bytes_per_frame;
 		goto again;
 	}