X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=alsa_write.c;h=ae8bed6d339724563e86eb899d9aa96a46f6f8e7;hp=df39716fbdd36e1a608c6c197cc3a8d3b36e8a49;hb=ad6c68022eea0b0962855a2120cf242446bf10b9;hpb=813bec7dd99c3f5f43f046af0b1c87d70010dd19

diff --git a/alsa_write.c b/alsa_write.c
index df39716f..ae8bed6d 100644
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -12,6 +12,7 @@
  * based on the vplay program by Michael Beck.
  */
 
+#include <regex.h>
 #include <sys/types.h>
 #include <dirent.h>
 #include <alsa/asoundlib.h>
@@ -166,19 +167,19 @@ static int alsa_write_post_select(__a_unused struct sched *s,
 {
 	struct private_alsa_write_data *pad = wn->private_data;
 	struct writer_node_group *wng = wn->wng;
-	size_t frames, bytes = *wng->loaded - wn->written;
-	unsigned char *data = (unsigned char*)wng->buf + wn->written;
+	size_t bytes = *wng->loaded - wn->written;
+	unsigned char *data = (unsigned char*)*wng->bufp + wn->written;
 	struct timeval tv;
-	snd_pcm_sframes_t ret;
+	snd_pcm_sframes_t ret, frames, avail;
 
 	if (*wng->input_error < 0 && (!pad->handle || bytes < pad->bytes_per_frame)) {
 		wn->written = *wng->loaded;
 		return *wng->input_error;
 	}
 	if (!bytes) /* no data available */
-		goto out;
+		return 0;
 	if (tv_diff(now, &pad->next_chunk, NULL) < 0)
-		goto out;
+		return 0;
 	if (!pad->handle) {
 		int err = alsa_init(pad, wn->conf);
 		if (err < 0)
@@ -186,30 +187,29 @@ static int alsa_write_post_select(__a_unused struct sched *s,
 	}
 	frames = bytes / pad->bytes_per_frame;
 	if (!frames) /* less than a single frame available */
-		goto out;
+		return 0;
+	avail = snd_pcm_avail_update(pad->handle);
+	if (avail <= 0)
+		goto delay;
+	frames = PARA_MIN(frames, avail);
 	ret = snd_pcm_writei(pad->handle, data, frames);
-	if (ret == -EPIPE) {
-		PARA_WARNING_LOG("EPIPE\n");
-		snd_pcm_prepare(pad->handle);
-		return 1;
-	}
-	if (ret < 0 && ret != -EAGAIN) {
-		PARA_WARNING_LOG("alsa error (%zu frames, ret = %d\n",
-			frames, (int)ret);
+	if (ret < 0) {
+		PARA_WARNING_LOG("%s\n", snd_strerror(-ret));
+		if (ret == -EPIPE) {
+			snd_pcm_prepare(pad->handle);
+			return 0;
+		}
+		if (ret == -EAGAIN)
+			goto delay;
 		return -E_ALSA_WRITE;
 	}
-	if (ret == -EAGAIN)
-		PARA_DEBUG_LOG("EAGAIN\n");
-	else
-		wn->written += ret * pad->bytes_per_frame;
-	if (ret == frames) /* we wrote everything, try again immediately */
-		pad->next_chunk	= *now;
-	else { /* wait until 50% buffer space is available */
-		ms2tv(pad->buffer_time / 2000, &tv);
-		tv_add(now, &tv, &pad->next_chunk);
-	}
-out:
+	wn->written += ret * pad->bytes_per_frame;
 	return 1;
+delay:
+	/* wait until 50% buffer space is available */
+	ms2tv(pad->buffer_time / 2000, &tv);
+	tv_add(now, &tv, &pad->next_chunk);
+	return 0;
 }
 
 static void alsa_close(struct writer_node *wn)
@@ -264,4 +264,5 @@ void alsa_write_init(struct writer *w)
 		.short_help = alsa_write_args_info_help,
 		.detailed_help = alsa_write_args_info_detailed_help
 	};
+	alsa_cmdline_parser_free(&dummy);
 }