X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=alsa_write.c;h=2dab8fe1543f9205d8d12d7fa9db85be60768df6;hb=b9d2cfbf8415ecacfe57b8cb94d97b662d3a3352;hp=b89c8c31c8007ec6267ecac96acec6ca0d1ad1ce;hpb=32309225ba462289fc6b51c22e6929d90f764dfa;p=paraslash.git

diff --git a/alsa_write.c b/alsa_write.c
index b89c8c31..2dab8fe1 100644
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -36,10 +36,6 @@ struct private_alsa_write_data {
 	snd_pcm_t *handle;
 	/** Determined and set by alsa_init(). */
 	int bytes_per_frame;
-	/** The approximate maximum buffer duration in us. */
-	unsigned buffer_time;
-	/* Number of frames that fit into the buffer. */
-	snd_pcm_uframes_t buffer_frames;
 	/**
 	 * The sample rate given by command line option or the decoder
 	 * of the writer node group.
@@ -76,7 +72,9 @@ static int alsa_init(struct private_alsa_write_data *pad,
 	snd_pcm_hw_params_t *hwparams;
 	snd_pcm_sw_params_t *swparams;
 	snd_pcm_uframes_t start_threshold, stop_threshold;
-	snd_pcm_uframes_t period_size;
+	snd_pcm_uframes_t buffer_size, period_size;
+	snd_output_t *log;
+	unsigned buffer_time;
 	int err;
 
 	PARA_INFO_LOG("opening %s\n", conf->device_arg);
@@ -102,32 +100,30 @@ static int alsa_init(struct private_alsa_write_data *pad,
 			&pad->sample_rate, NULL) < 0)
 		return -E_SET_RATE;
 	err = snd_pcm_hw_params_get_buffer_time_max(hwparams,
-		&pad->buffer_time, NULL);
-	if (err < 0 || !pad->buffer_time)
+		&buffer_time, NULL);
+	if (err < 0 || buffer_time == 0)
 		return -E_GET_BUFFER_TIME;
-	PARA_INFO_LOG("buffer time: %d\n", pad->buffer_time);
 	if (snd_pcm_hw_params_set_buffer_time_near(pad->handle, hwparams,
-			&pad->buffer_time, NULL) < 0)
+			&buffer_time, NULL) < 0)
 		return -E_SET_BUFFER_TIME;
 	if (snd_pcm_hw_params(pad->handle, hwparams) < 0)
 		return -E_HW_PARAMS;
 	snd_pcm_hw_params_get_period_size(hwparams, &period_size, NULL);
-	snd_pcm_hw_params_get_buffer_size(hwparams, &pad->buffer_frames);
-	PARA_INFO_LOG("buffer size: %lu, period_size: %lu\n", pad->buffer_frames,
-		period_size);
-	if (period_size == pad->buffer_frames)
+	snd_pcm_hw_params_get_buffer_size(hwparams, &buffer_size);
+	if (period_size == buffer_size)
 		return -E_BAD_PERIOD;
+	/* software parameter setup */
 	snd_pcm_sw_params_current(pad->handle, swparams);
 	snd_pcm_sw_params_set_avail_min(pad->handle, swparams, period_size);
-	if (pad->buffer_frames < 1)
+	if (buffer_size < 1)
 		start_threshold = 1;
 	else
-		start_threshold = PARA_MIN(pad->buffer_frames,
+		start_threshold = PARA_MIN(buffer_size,
 			(snd_pcm_uframes_t)pad->sample_rate);
 	if (snd_pcm_sw_params_set_start_threshold(pad->handle, swparams,
 			start_threshold) < 0)
 		return -E_START_THRESHOLD;
-	stop_threshold = pad->buffer_frames;
+	stop_threshold = buffer_size;
 	if (snd_pcm_sw_params_set_stop_threshold(pad->handle, swparams,
 			stop_threshold) < 0)
 		return -E_STOP_THRESHOLD;
@@ -137,9 +133,24 @@ static int alsa_init(struct private_alsa_write_data *pad,
 		* pad->channels / 8;
 	if (pad->bytes_per_frame <= 0)
 		return -E_PHYSICAL_WIDTH;
-	PARA_INFO_LOG("bytes per frame: %d\n", pad->bytes_per_frame);
 	if (snd_pcm_nonblock(pad->handle, 1))
 		PARA_ERROR_LOG("failed to set nonblock mode\n");
+	err = snd_output_buffer_open(&log);
+	if (err == 0) {
+		char *buf;
+		PARA_INFO_LOG("dumping alsa configuration\n");
+		snd_pcm_dump(pad->handle, log);
+		snd_output_buffer_string(log, &buf);
+		for (;;) {
+			char *p = strchr(buf, '\n');
+			if (!p) /* omit last output line, it's empty */
+				break;
+			*p = '\0';
+			PARA_INFO_LOG("%s\n", buf);
+			buf = p + 1;
+		}
+		snd_output_close(log);
+	}
 	return 1;
 }