X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=alsa_write.c;h=bbbf8b650ac86c4952ac46f22c166583018bfb88;hp=3935c8c687be53e25791abbb93697a8d61186527;hb=eb3142c19116730b126ca5e6a6ed2f06bed8b30f;hpb=870fcd0379ab096184f42481541d668694da7c83

diff --git a/alsa_write.c b/alsa_write.c
index 3935c8c6..bbbf8b65 100644
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file alsa_write.c paraslash's alsa output plugin */
 
@@ -244,6 +240,8 @@ static void alsa_close(struct writer_node *wn)
 
 	if (!pad)
 		return;
+	if (!pad->handle)
+		goto free_pad;
 	/*
 	 * It's OK to have a blocking operation here because we already made
 	 * sure that the PCM output buffer is (nearly) empty.
@@ -252,6 +250,7 @@ static void alsa_close(struct writer_node *wn)
 	snd_pcm_drain(pad->handle);
 	snd_pcm_close(pad->handle);
 	snd_config_update_free_global();
+free_pad:
 	free(pad);
 }
 
@@ -270,6 +269,8 @@ static int alsa_write_post_select(__a_unused struct sched *s, void *context)
 		goto err;
 again:
 	ret = btr_node_status(btrn, wn->min_iqs, BTR_NT_LEAF);
+	if (ret < 0)
+		goto err;
 	if (ret == 0)
 		return 0;
 	btr_merge(btrn, wn->min_iqs);
@@ -296,21 +297,23 @@ again:
 		if (bytes == 0) /* no data available */
 			return 0;
 		pad = wn->private_data = para_calloc(sizeof(*pad));
-		get_btr_sample_rate(btrn, &val);
+		ret = get_btr_sample_rate(btrn, &val);
+		if (ret < 0)
+			goto err;
 		pad->sample_rate = val;
-		get_btr_channels(btrn, &val);
+		ret = get_btr_channels(btrn, &val);
+		if (ret < 0)
+			goto err;
 		pad->channels = val;
-		get_btr_sample_format(btrn, &val);
+		ret = get_btr_sample_format(btrn, &val);
+		if (ret < 0)
+			goto err;
 		pad->sample_format = get_alsa_pcm_format(val);
-
 		PARA_INFO_LOG("%u channel(s), %uHz\n", pad->channels,
 			pad->sample_rate);
 		ret = alsa_init(wn);
-		if (ret < 0) {
-			free(wn->private_data);
-			wn->private_data = NULL;
+		if (ret < 0)
 			goto err;
-		}
 		wn->min_iqs = pad->bytes_per_frame;
 		goto again;
 	}
@@ -328,7 +331,11 @@ again:
 		goto again;
 	}
 	if (frames == -EPIPE) {
-		PARA_WARNING_LOG("underrun (tried to write %zu bytes)\n", bytes);
+		snd_pcm_status_t *status;
+		snd_pcm_status_malloc(&status);
+		if (snd_pcm_status_get_state(status) == SND_PCM_STATE_XRUN)
+			PARA_WARNING_LOG("underrun\n");
+		snd_pcm_status_free(status);
 		snd_pcm_prepare(pad->handle);
 		return 0;
 	}