X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oss_write.c;h=311a514dc86ff6bfb01abf53d16a75672827af12;hp=6f646c904016f92b13ea1b04f4a8cbb9f31243b8;hb=HEAD;hpb=8d106ca317a2c42f35a86ba244f843688f6939e6

diff --git a/oss_write.c b/oss_write.c
index 6f646c90..4ea85afa 100644
--- a/oss_write.c
+++ b/oss_write.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2009 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2009 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file oss_write.c Paraslash's oss output plugin. */
 
@@ -61,11 +57,11 @@ static int get_oss_format(enum sample_format sf)
 	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;
+	default: return -E_BAD_SAMPLE_FORMAT;
 	}
 }
 
-static void oss_pre_select(struct sched *s, void *context)
+static void oss_pre_monitor(struct sched *s, void *context)
 {
 	struct writer_node *wn = context;
 	struct private_oss_write_data *powd = wn->private_data;
@@ -75,7 +71,7 @@ static void oss_pre_select(struct sched *s, void *context)
 		return;
 	if (ret < 0 || !powd)
 		return sched_min_delay(s);
-	para_fd_set(powd->fd, &s->wfds, &s->max_fileno);
+	sched_monitor_writefd(powd->fd, s);
 }
 
 static void oss_close(struct writer_node *wn)
@@ -105,7 +101,7 @@ static int oss_init(struct writer_node *wn, unsigned sample_rate,
 {
 	int ret, format;
 	unsigned ch, rate;
-	struct private_oss_write_data *powd = para_calloc(sizeof(*powd));
+	struct private_oss_write_data *powd = zalloc(sizeof(*powd));
 	const char *dev = WRITE_CMD_OPT_STRING_VAL(OSS, DEVICE, wn->lpr);
 
 	PARA_INFO_LOG("opening %s\n", dev);
@@ -117,10 +113,14 @@ static int oss_init(struct writer_node *wn, unsigned sample_rate,
 	if (ret < 0)
 		goto err;
 	/* set PCM format */
-	sample_format = format = get_oss_format(sample_format);
+	ret = get_oss_format(sample_format);
+	if (ret < 0)
+		return ret;
+	sample_format = format = ret;
 	ret = ioctl(powd->fd, SNDCTL_DSP_SETFMT, &format);
 	if (ret < 0) {
 		ret = -ERRNO_TO_PARA_ERROR(errno);
+		PARA_ERROR_LOG("could not set sample format\n");
 		goto err;
 	}
 	ret = -E_BAD_SAMPLE_FORMAT;
@@ -178,7 +178,7 @@ err_free:
 	return ret;
 }
 
-static int oss_post_select(__a_unused struct sched *s, void *context)
+static int oss_post_monitor(__a_unused struct sched *s, void *context)
 {
 	struct writer_node *wn = context;
 	struct private_oss_write_data *powd = wn->private_data;
@@ -199,9 +199,15 @@ static int oss_post_select(__a_unused struct sched *s, void *context)
 
 		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 = get_btr_sample_rate(btrn, &rate);
+		if (ret < 0)
+			goto out;
+		ret = get_btr_channels(btrn, &ch);
+		if (ret < 0)
+			goto out;
+		ret = get_btr_sample_format(btrn, &format);
+		if (ret < 0)
+			goto out;
 		ret = oss_init(wn, rate, ch, format);
 		if (ret < 0)
 			goto out;
@@ -212,11 +218,11 @@ static int oss_post_select(__a_unused struct sched *s, void *context)
 	bytes = btr_next_buffer(btrn, &data);
 	frames = bytes / powd->bytes_per_frame;
 	if (!frames) { /* eof and less than a single frame available */
-		ret = -E_WRITE_COMMON_EOF;
+		ret = -E_EOF;
 		goto out;
 	}
 	ret = 0;
-	if (!FD_ISSET(powd->fd, &s->wfds))
+	if (!sched_write_ok(powd->fd, s))
 		goto out;
 	/* get maximal number of bytes that can be written */
 	ret = ioctl(powd->fd, SNDCTL_DSP_GETOSPACE, &abi);
@@ -239,7 +245,7 @@ out:
 }
 
 const struct writer lsg_write_cmd_com_oss_user_data = {
-	.pre_select = oss_pre_select,
-	.post_select = oss_post_select,
+	.pre_monitor = oss_pre_monitor,
+	.post_monitor = oss_post_monitor,
 	.close = oss_close,
 };