X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=alsa_write.c;h=fd3b404c0359c1a571255b1ac7265b0ee0faef41;hp=43b26868bef5abdf3d9268cc93f7b1ca8524693f;hb=ce9e297eb91a932a11f81890c800d0380b5bc9c9;hpb=f167629b3191c57a6b691cd2a6af04a45a74ccb0

diff --git a/alsa_write.c b/alsa_write.c
index 43b26868..fd3b404c 100644
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -74,8 +74,8 @@ static snd_pcm_format_t get_alsa_pcm_format(enum sample_format sf)
 static int alsa_init(struct private_alsa_write_data *pad,
 		struct alsa_write_args_info *conf)
 {
-	snd_pcm_hw_params_t *hwparams;
-	snd_pcm_sw_params_t *swparams;
+	snd_pcm_hw_params_t *hwparams = NULL;
+	snd_pcm_sw_params_t *swparams = NULL;
 	snd_pcm_uframes_t start_threshold, stop_threshold;
 	snd_pcm_uframes_t buffer_size, period_size;
 	snd_output_t *output_log;
@@ -89,7 +89,8 @@ static int alsa_init(struct private_alsa_write_data *pad,
 		SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK);
 	if (ret < 0)
 		goto fail;
-	snd_pcm_hw_params_alloca(&hwparams);
+	ret = snd_pcm_hw_params_malloc(&hwparams);
+	assert(ret >= 0);
 	msg = "Broken alsa configuration";
 	ret = snd_pcm_hw_params_any(pad->handle, hwparams);
 	if (ret < 0)
@@ -125,7 +126,7 @@ static int alsa_init(struct private_alsa_write_data *pad,
 	period_time = pad->buffer_time * 250; /* buffer time / 4 */
 	msg = "could not set period time";
 	ret = snd_pcm_hw_params_set_period_time_near(pad->handle, hwparams,
-		&period_time, 0);
+		&period_time, NULL);
 	if (ret < 0)
 		goto fail;
 
@@ -140,7 +141,8 @@ static int alsa_init(struct private_alsa_write_data *pad,
 		goto fail;
 
 	/* software parameter setup */
-	snd_pcm_sw_params_alloca(&swparams);
+	ret = snd_pcm_sw_params_malloc(&swparams);
+	assert(ret >= 0);
 	snd_pcm_sw_params_current(pad->handle, swparams);
 	snd_pcm_sw_params_set_avail_min(pad->handle, swparams, period_size);
 	if (buffer_size < 1)
@@ -190,13 +192,18 @@ static int alsa_init(struct private_alsa_write_data *pad,
 		}
 		snd_output_close(output_log);
 	}
-	return 1;
+	ret = 1;
+	goto out;
 fail:
 	if (ret < 0)
 		PARA_ERROR_LOG("%s: %s\n", msg, snd_strerror(-ret));
 	else
 		PARA_ERROR_LOG("%s\n", msg);
-	return -E_ALSA;
+	ret = -E_ALSA;
+out:
+	snd_pcm_hw_params_free(hwparams);
+	snd_pcm_sw_params_free(swparams);
+	return ret;
 }
 
 static void alsa_write_pre_select(struct sched *s, void *context)
@@ -296,7 +303,7 @@ again:
 		get_btr_sample_format(btrn, &val);
 		pad->sample_format = get_alsa_pcm_format(val);
 
-		PARA_INFO_LOG("%d channel(s), %dHz\n", pad->channels,
+		PARA_INFO_LOG("%u channel(s), %uHz\n", pad->channels,
 			pad->sample_rate);
 		ret = alsa_init(pad, wn->conf);
 		if (ret < 0) {