X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oss_write.c;h=20186667e2f383880538275d61d1607203ed2b8a;hp=77fe2a51314e1268fdfcc3b5b1b2db68ac816788;hb=7eaf2faf618705c97c77750371e177108aaa5897;hpb=8aa9d0cddfefb882cfd8e7cadbeea5cce31b731f

diff --git a/oss_write.c b/oss_write.c
index 77fe2a51..20186667 100644
--- a/oss_write.c
+++ b/oss_write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2014 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2009 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <sys/ioctl.h>
-#include <fcntl.h>
 #include <sys/soundcard.h>
 
 #include "para.h"
@@ -31,6 +30,29 @@ struct private_oss_write_data {
 	int bytes_per_frame;
 };
 
+/*
+ * We keep one bit of static storage to make sure only one instance of the oss
+ * writer is running at any given time.
+ */
+static bool sound_device_busy;
+
+static bool sound_device_is_busy(void)
+{
+	return sound_device_busy;
+}
+
+static void set_sound_device_busy(void)
+{
+	assert(!sound_device_busy);
+	sound_device_busy = true;
+}
+
+static void set_sound_device_idle(void)
+{
+	assert(sound_device_busy);
+	sound_device_busy = false;
+}
+
 static int get_oss_format(enum sample_format sf)
 {
 	switch (sf) {
@@ -50,7 +72,7 @@ static void oss_pre_select(struct sched *s, void *context)
 	struct private_oss_write_data *powd = wn->private_data;
 	int ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
 
-	if (ret == 0)
+	if (ret == 0 || (sound_device_is_busy() && !powd))
 		return;
 	if (ret < 0 || !powd)
 		return sched_min_delay(s);
@@ -65,6 +87,7 @@ static void oss_close(struct writer_node *wn)
 		return;
 	close(powd->fd);
 	free(powd);
+	set_sound_device_idle();
 }
 
 /*
@@ -123,7 +146,7 @@ static int oss_init(struct writer_node *wn, unsigned sample_rate,
 	 * Set sampling rate
 	 *
 	 * If we request a higher sampling rate than is supported by the
-	 * device, the the highest possible speed is automatically used. The
+	 * device, the highest possible speed is automatically used. The
 	 * value actually used is returned as the new value of the argument.
 	 */
 	rate = sample_rate;
@@ -142,7 +165,7 @@ static int oss_init(struct writer_node *wn, unsigned sample_rate,
 		ret = -E_BAD_SAMPLERATE;
 		if (100 * max > 110 * min) /* more than 10% deviation */
 			goto err;
-		PARA_NOTICE_LOG("using %dHz rather than %dHz\n", rate,
+		PARA_NOTICE_LOG("using %uHz rather than %uHz\n", rate,
 			sample_rate);
 	}
 	wn->min_iqs = powd->bytes_per_frame;
@@ -165,6 +188,7 @@ static int oss_post_select(__a_unused struct sched *s, void *context)
 	size_t frames, bytes;
 	int ret;
 	char *data;
+	audio_buf_info abi;
 
 	ret = task_get_notification(wn->task);
 	if (ret < 0)
@@ -174,12 +198,16 @@ static int oss_post_select(__a_unused struct sched *s, void *context)
 		goto out;
 	if (!powd) {
 		int32_t rate, ch, format;
+
+		if (sound_device_is_busy())
+			return 0;
 		get_btr_sample_rate(btrn, &rate);
 		get_btr_channels(btrn, &ch);
 		get_btr_sample_format(btrn, &format);
 		ret = oss_init(wn, rate, ch, format);
 		if (ret < 0)
 			goto out;
+		set_sound_device_busy();
 		return 0;
 	}
 	btr_merge(btrn, wn->min_iqs);
@@ -192,6 +220,15 @@ static int oss_post_select(__a_unused struct sched *s, void *context)
 	ret = 0;
 	if (!FD_ISSET(powd->fd, &s->wfds))
 		goto out;
+	/* get maximal number of bytes that can be written */
+	ret = ioctl(powd->fd, SNDCTL_DSP_GETOSPACE, &abi);
+	if (ret >= 0) {
+		size_t max_frames = abi.bytes / powd->bytes_per_frame;
+		if (max_frames == 0)
+			goto out;
+		/* cap number of frames to avoid sound artefacts */
+		frames = PARA_MIN(frames, max_frames);
+	}
 	ret = xwrite(powd->fd, data, frames * powd->bytes_per_frame);
 	if (ret < 0)
 		goto out;