X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=alsa_write.c;h=c2a4cc1e94f47d9cf9717334059e6cf57df4970a;hp=d649341837d3284f7aaf9b1fc83ab22f217826b6;hb=a24d175e6d093d6d9f6e583c3026e45924bad621;hpb=9417eae5ca2b9f10d25f769221e8fd91048bc68a

diff --git a/alsa_write.c b/alsa_write.c
index d6493418..c2a4cc1e 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>
@@ -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;
 	}