X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=alsa_write.c;h=bbbf8b650ac86c4952ac46f22c166583018bfb88;hb=2bad70d84e763b4d866d7b97dbc1cdc8e030bd45;hp=bc06fc315bc51fb3fc1fa9729ae429b47a70d4b4;hpb=c75c35b176cdacf157d27617e954961c88f33975;p=paraslash.git

diff --git a/alsa_write.c b/alsa_write.c
index bc06fc31..bbbf8b65 100644
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -240,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.
@@ -248,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);
 }
 
@@ -294,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;
 	}
@@ -326,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;
 	}