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

diff --git a/alsa_write.c b/alsa_write.c
index 1c168e7b..5965159e 100644
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -150,10 +150,14 @@ static void alsa_write_pre_select(struct sched *s, struct task *t)
 
 	if (ret == 0)
 		return;
-	if (!pad)
-		return sched_min_delay(s);
-	if (ret < 0)
-		return sched_request_barrier_or_min_delay(&pad->drain_barrier, 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.
@@ -253,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;
 	}
@@ -262,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:
@@ -276,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;