X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oss_write.c;h=ea31fc8124aa84d374e3b7e48a32758a052b5352;hp=10a64497d58b9c024aa9d1097bd7976da3b79883;hb=009e80ae25df7a247a263b5b8e2259c9bdfe20ce;hpb=b0fe6d882dd35b01360a66e130d6714aff7b6a0d

diff --git a/oss_write.c b/oss_write.c
index 10a64497..ea31fc81 100644
--- a/oss_write.c
+++ b/oss_write.c
@@ -53,7 +53,8 @@ static void oss_close(struct writer_node *wn)
 {
 	struct private_oss_write_data *powd = wn->private_data;
 
-	close(powd->fd);
+	if (powd->fd >= 0)
+		close(powd->fd);
 	free(powd);
 }
 
@@ -68,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;
@@ -114,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.
@@ -131,13 +132,13 @@ 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;
 err:
 	close(powd->fd);
-	free(powd);
+	powd->fd = -1;
 	return ret;
 }
 
@@ -145,7 +146,6 @@ static void oss_post_select(__a_unused struct sched *s,
 		struct task *t)
 {
 	struct writer_node *wn = container_of(t, struct writer_node, task);
-	struct oss_write_args_info *conf = wn->conf;
 	struct private_oss_write_data *powd = wn->private_data;
 	struct btr_node *btrn = wn->btrn;
 	size_t frames, bytes;
@@ -158,21 +158,14 @@ static void oss_post_select(__a_unused struct sched *s,
 		return;
 	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 (ret < 0)
-			rate = conf->samplerate_arg;
-		ret = -1;
-		if (!conf->channels_given)
-			ret = get_btr_channels(wn->btrn, &ch);
-		if (ret < 0)
-			ch = conf->channels_arg;
+		get_btr_sample_rate(btrn, &rate);
+		get_btr_channels(btrn, &ch);
 		ret = oss_init(wn, rate, ch);
 		if (ret < 0)
 			goto out;
 		return;
 	}
+	btr_merge(btrn, wn->min_iqs);
 	bytes = btr_next_buffer(btrn, &data);
 	frames = bytes / powd->bytes_per_frame;
 	if (!frames) { /* eof and less than a single frame available */
@@ -182,7 +175,7 @@ static void oss_post_select(__a_unused struct sched *s,
 	ret = 0;
 	if (!FD_ISSET(powd->fd, &s->wfds))
 		goto out;
-	ret = write_nonblock(powd->fd, data, frames * powd->bytes_per_frame, 0);
+	ret = write_nonblock(powd->fd, data, frames * powd->bytes_per_frame);
 	if (ret < 0)
 		goto out;
 	btr_consume(btrn, ret);