X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=osx_write.c;h=65a5adc79db3164ded3ef5a79070eb0ee71a43b4;hp=cde7fcea867ef4bb35b9799f2c0b59dce455085e;hb=009e80ae25df7a247a263b5b8e2259c9bdfe20ce;hpb=d4d37bb32a8d6219f9f52aa2ee3de55eb7e099c8

diff --git a/osx_write.c b/osx_write.c
index cde7fcea..65a5adc7 100644
--- a/osx_write.c
+++ b/osx_write.c
@@ -172,7 +172,7 @@ static int osx_write_open(struct writer_node *wn)
 	AudioStreamBasicDescription format;
 	int ret;
 	struct btr_node *btrn = wn->btrn;
-	struct osx_write_args_info *conf = wn->conf;
+	int32_t val;
 
 	wn->private_data = powd;
 	/* where did that default audio output go? */
@@ -193,18 +193,10 @@ static int osx_write_open(struct writer_node *wn)
 	if (AudioUnitInitialize(powd->audio_unit))
 		goto e1;
 	powd->play = 0;
-	powd->sample_rate = conf->sample_rate_arg;
-	powd->channels = conf->channels_arg;
-	if (!conf->sample_rate_given) {
-		int32_t rate;
-		get_btr_sample_rate(btrn, &rate);
-		powd->sample_rate = rate;
-	}
-	if (!conf->channels_given) {
-		int32_t ch;
-		get_btr_channels(btrn, &ch);
-		powd->channels = ch;
-	}
+	get_btr_sample_rate(btrn, &val);
+	powd->sample_rate = val;
+	get_btr_channels(btrn, &val);
+	powd->channels = val;
 	/*
 	 * Choose PCM format. We tell the Output Unit what format we're going
 	 * to supply data to it. This is necessary if you're providing data