X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=oss_write.c;h=6ca1e16eaf62d33a54d58456d43779fb055c3bec;hb=d4d37bb32a8d6219f9f52aa2ee3de55eb7e099c8;hp=6525afa48fca41a9f42d01f36d36315f054c3cf5;hpb=2c0737b48ed5a6b269e77a95e4f9bf1bf601f9d9;p=paraslash.git

diff --git a/oss_write.c b/oss_write.c
index 6525afa4..6ca1e16e 100644
--- a/oss_write.c
+++ b/oss_write.c
@@ -69,7 +69,7 @@ static void oss_close(struct writer_node *wn)
  * incorrectly believe that the device is still in 44.1 kHz mode when actually
  * the speed is decreased to 22.05 kHz.
  */
-static int oss_init(struct writer_node *wn, unsigned samplerate, unsigned channels)
+static int oss_init(struct writer_node *wn, unsigned sample_rate, unsigned channels)
 {
 	int ret, format = FORMAT;
 	unsigned ch, rate;
@@ -115,15 +115,15 @@ static int oss_init(struct writer_node *wn, unsigned samplerate, unsigned channe
 	 * device, the the highest possible speed is automatically used. The
 	 * value actually used is returned as the new value of the argument.
 	 */
-	rate = samplerate;
+	rate = sample_rate;
 	ret = ioctl(powd->fd, SNDCTL_DSP_SPEED, &rate);
 	if (ret < 0) {
 		ret = -ERRNO_TO_PARA_ERROR(errno);
 		goto err;
 	}
-	if (rate != samplerate) {
-		unsigned min = PARA_MIN(rate, samplerate),
-			max = PARA_MAX(rate, samplerate);
+	if (rate != sample_rate) {
+		unsigned min = PARA_MIN(rate, sample_rate),
+			max = PARA_MAX(rate, sample_rate);
 		/*
 		 * Check whether the returned sample rate differs significantly
 		 * from the requested one.
@@ -132,7 +132,7 @@ static int oss_init(struct writer_node *wn, unsigned samplerate, unsigned channe
 		if (100 * max > 110 * min) /* more than 10% deviation */
 			goto err;
 		PARA_NOTICE_LOG("using %dHz rather than %dHz\n", rate,
-			samplerate);
+			sample_rate);
 	}
 	wn->min_iqs = powd->bytes_per_frame;
 	return 1;
@@ -160,10 +160,10 @@ static void oss_post_select(__a_unused struct sched *s,
 	if (powd->fd < 0) {
 		int32_t rate, ch;
 		ret = -1;
-		if (!conf->samplerate_given) /* config option trumps btr_exec */
-			ret = get_btr_samplerate(wn->btrn, &rate);
+		if (!conf->sample_rate_given) /* config option trumps btr_exec */
+			ret = get_btr_sample_rate(wn->btrn, &rate);
 		if (ret < 0)
-			rate = conf->samplerate_arg;
+			rate = conf->sample_rate_arg;
 		ret = -1;
 		if (!conf->channels_given)
 			ret = get_btr_channels(wn->btrn, &ch);