X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=alsa_write.c;h=f24e117be072a757af58f57349e9f26e0e689ef4;hp=7a4b868d251f0ee780647f72457b1c3162549bf0;hb=1c859dfc274c592eca267197131d6497b650b24c;hpb=b0fe6d882dd35b01360a66e130d6714aff7b6a0d

diff --git a/alsa_write.c b/alsa_write.c
index 7a4b868d..f24e117b 100644
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -45,10 +45,10 @@ struct private_alsa_write_data {
 	/* Number of frames that fit into the buffer. */
 	snd_pcm_uframes_t buffer_frames;
 	/**
-	 * The samplerate given by command line option or the decoder
+	 * The sample rate given by command line option or the decoder
 	 * of the writer node group.
 	 */
-	unsigned samplerate;
+	unsigned sample_rate;
 	/**
 	 * The number of channels, given by command line option or the
 	 * decoder of the writer node group.
@@ -86,7 +86,7 @@ static int alsa_init(struct private_alsa_write_data *pad,
 			pad->channels) < 0)
 		return -E_CHANNEL_COUNT;
 	if (snd_pcm_hw_params_set_rate_near(pad->handle, hwparams,
-			&pad->samplerate, NULL) < 0)
+			&pad->sample_rate, NULL) < 0)
 		return -E_SET_RATE;
 	err = snd_pcm_hw_params_get_buffer_time_max(hwparams,
 		&pad->buffer_time, NULL);
@@ -110,7 +110,7 @@ static int alsa_init(struct private_alsa_write_data *pad,
 		start_threshold = 1;
 	else
 		start_threshold = PARA_MIN(pad->buffer_frames,
-			(snd_pcm_uframes_t)pad->samplerate);
+			(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;
@@ -228,23 +228,19 @@ again:
 		return;
 	}
 	if (!pad->handle) {
-		struct alsa_write_args_info *conf = wn->conf;
+		int32_t val;
 		if (bytes == 0) /* no data available */
 			return;
-		/* defaults */
-		pad->samplerate = conf->samplerate_arg;
-		pad->channels = conf->channels_arg;
-		if (!conf->samplerate_given) { /* config option trumps btr_exec */
-			int32_t rate;
-			if (get_btr_samplerate(btrn, &rate) >= 0)
-				pad->samplerate = rate;
-		}
-		if (!conf->channels_given) {
-			int32_t ch;
-			if (get_btr_channels(btrn, &ch) >= 0)
-				pad->channels = ch;
-		}
-		PARA_INFO_LOG("%d channel(s), %dHz\n", pad->channels, pad->samplerate);
+		ret = get_btr_sample_rate(btrn, &val);
+		if (ret < 0)
+			goto err;
+		pad->sample_rate = val;
+		ret = get_btr_channels(btrn, &val);
+		if (ret < 0)
+			goto err;
+		pad->channels = val;
+		PARA_INFO_LOG("%d channel(s), %dHz\n", pad->channels,
+			pad->sample_rate);
 		ret = alsa_init(pad, wn->conf);
 		if (ret < 0)
 			goto err;