X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=alsa_write.c;h=5965159ed9e50af87401f4f2968d7155439bb568;hp=ae3bbfbab60c82ab26311c00b1d0389a7544ec5c;hb=b4ed16eddb2433f002139ad1e133427b77814d43;hpb=0267a3f3f13e16bc92b890e1d5bd49c5bd5c58e3

diff --git a/alsa_write.c b/alsa_write.c
index ae3bbfba..5965159e 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)
@@ -214,7 +217,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 */
@@ -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:
@@ -277,7 +280,6 @@ __malloc static void *alsa_parse_config_or_die(const char *options)
 {
 	struct alsa_write_args_info *conf = para_calloc(sizeof(*conf));
 
-	PARA_INFO_LOG("options: %s, %zd\n", options, strcspn(options, " \t"));
 	/* exits on errors */
 	alsa_cmdline_parser_string(options, conf, "alsa_write");
 	return conf;