X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=alsa_write.c;h=2e096c0c78856e6d0691f31c5fcba768ab3a695d;hp=535e7194c07f021e9958907effc5d8816333a8c7;hb=85e517f39753631d484e266d6ec80db56bf7af43;hpb=4ac3134c050ba28b57e0ae9686eb1f6d83e6d586

diff --git a/alsa_write.c b/alsa_write.c
index 535e7194..2e096c0c 100644
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -72,7 +72,7 @@ static int alsa_init(struct private_alsa_write_data *pad,
 	snd_pcm_sw_params_t *swparams;
 	snd_pcm_uframes_t start_threshold, stop_threshold;
 	snd_pcm_uframes_t buffer_size, period_size;
-	snd_output_t *log;
+	snd_output_t *output_log;
 	unsigned buffer_time;
 	int ret;
 	const char *msg;
@@ -163,12 +163,12 @@ static int alsa_init(struct private_alsa_write_data *pad,
 	ret = snd_pcm_nonblock(pad->handle, 1);
 	if (ret < 0)
 		goto fail;
-	ret = snd_output_buffer_open(&log);
+	ret = snd_output_buffer_open(&output_log);
 	if (ret == 0) {
 		char *buf;
 		PARA_INFO_LOG("dumping alsa configuration\n");
-		snd_pcm_dump(pad->handle, log);
-		snd_output_buffer_string(log, &buf);
+		snd_pcm_dump(pad->handle, output_log);
+		snd_output_buffer_string(output_log, &buf);
 		for (;;) {
 			char *p = strchr(buf, '\n');
 			if (!p) /* omit last output line, it's empty */
@@ -177,7 +177,7 @@ static int alsa_init(struct private_alsa_write_data *pad,
 			PARA_INFO_LOG("%s\n", buf);
 			buf = p + 1;
 		}
-		snd_output_close(log);
+		snd_output_close(output_log);
 	}
 	return 1;
 fail: