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

diff --git a/oss_write.c b/oss_write.c
index 6ca1e16e..2d820d33 100644
--- a/oss_write.c
+++ b/oss_write.c
@@ -25,9 +25,6 @@
 #include "oss_write.cmdline.h"
 #include "error.h"
 
-/** Always use 16 bit little endian. */
-#define FORMAT AFMT_S16_LE
-
 /** Data specific to the oss writer. */
 struct private_oss_write_data {
 	/** The file handle of the device. */
@@ -36,6 +33,19 @@ struct private_oss_write_data {
 	int bytes_per_frame;
 };
 
+static int get_oss_format(enum sample_format sf)
+{
+	switch (sf) {
+	case SF_S8: return AFMT_S8;
+	case SF_U8: return AFMT_U8;
+	case SF_S16_LE: return AFMT_S16_LE;
+	case SF_S16_BE: return AFMT_S16_BE;
+	case SF_U16_LE: return AFMT_U16_LE;
+	case SF_U16_BE: return AFMT_U16_BE;
+	default: return AFMT_S16_LE;
+	}
+}
+
 static void oss_pre_select(struct sched *s, struct task *t)
 {
 	struct writer_node *wn = container_of(t, struct writer_node, task);
@@ -69,9 +79,10 @@ 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 sample_rate, unsigned channels)
+static int oss_init(struct writer_node *wn, unsigned sample_rate,
+		unsigned channels, int sample_format)
 {
-	int ret, format = FORMAT;
+	int ret, format;
 	unsigned ch, rate;
 	struct oss_write_args_info *conf = wn->conf;
 	struct private_oss_write_data *powd = wn->private_data;
@@ -85,18 +96,16 @@ static int oss_init(struct writer_node *wn, unsigned sample_rate, unsigned chann
 	if (ret < 0)
 		goto err;
 	/* set PCM format */
+	sample_format = format = get_oss_format(sample_format);
 	ret = ioctl(powd->fd, SNDCTL_DSP_SETFMT, &format);
 	if (ret < 0) {
 		ret = -ERRNO_TO_PARA_ERROR(errno);
 		goto err;
 	}
 	ret = -E_BAD_SAMPLE_FORMAT;
-	if (format != FORMAT)
+	if (format != sample_format)
 		goto err;
 	/* set number of channels */
-	ret = -E_BAD_CHANNEL_COUNT;
-	if (channels == 0)
-		goto err;
 	ch = channels;
 	ret = ioctl(powd->fd, SNDCTL_DSP_CHANNELS, &ch);
 	if (ret < 0) {
@@ -106,7 +115,10 @@ static int oss_init(struct writer_node *wn, unsigned sample_rate, unsigned chann
 	ret = -E_BAD_CHANNEL_COUNT;
 	if (ch != channels)
 		goto err;
-	powd->bytes_per_frame = ch * 2;
+	if (format == SF_U8 || format == SF_S8)
+		powd->bytes_per_frame = ch;
+	else
+		powd->bytes_per_frame = ch * 2;
 
 	/*
 	 * Set sampling rate
@@ -146,7 +158,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,18 +169,11 @@ static void oss_post_select(__a_unused struct sched *s,
 	if (ret == 0)
 		return;
 	if (powd->fd < 0) {
-		int32_t rate, ch;
-		ret = -1;
-		if (!conf->sample_rate_given) /* config option trumps btr_exec */
-			ret = get_btr_sample_rate(wn->btrn, &rate);
-		if (ret < 0)
-			rate = conf->sample_rate_arg;
-		ret = -1;
-		if (!conf->channels_given)
-			ret = get_btr_channels(wn->btrn, &ch);
-		if (ret < 0)
-			ch = conf->channels_arg;
-		ret = oss_init(wn, rate, ch);
+		int32_t rate, ch, format;
+		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;
 		return;
@@ -195,28 +199,21 @@ out:
 		btr_remove_node(btrn);
 }
 
-static int oss_open(struct writer_node *wn)
+static void oss_open(struct writer_node *wn)
 {
-	struct private_oss_write_data *powd;
+	struct private_oss_write_data *powd = para_calloc(sizeof(*powd));
 
-	powd = para_calloc(sizeof(*powd));
-	wn->private_data = powd;
 	powd->fd = -1;
-	return 1;
+	wn->private_data = powd;
 }
 
-__malloc static void *oss_parse_config(const char *options)
+__malloc static void *oss_parse_config_or_die(const char *options)
 {
-	int ret;
 	struct oss_write_args_info *conf = para_calloc(sizeof(*conf));
 
-	ret = oss_cmdline_parser_string(options, conf, "oss_write");
-	if (ret)
-		goto err_out;
+	/* exits on errors */
+	oss_cmdline_parser_string(options, conf, "oss_write");
 	return conf;
-err_out:
-	free(conf);
-	return NULL;
 }
 
 static void oss_free_config(void *conf)
@@ -240,7 +237,7 @@ void oss_write_init(struct writer *w)
 	w->close = oss_close;
 	w->pre_select = oss_pre_select;
 	w->post_select = oss_post_select;
-	w->parse_config = oss_parse_config;
+	w->parse_config_or_die = oss_parse_config_or_die;
 	w->free_config = oss_free_config;
 	w->shutdown = NULL;
 	w->help = (struct ggo_help) {