X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oss_write.c;h=1a837e5700c7cfdb7e86951f8ae999645c49bd67;hp=75ad98b9faac0acfa912628c6bafed31d085b90b;hb=HEAD;hpb=181beb316afad036ac01a778544c5dec0a8d51c7

diff --git a/oss_write.c b/oss_write.c
index 75ad98b9..4ea85afa 100644
--- a/oss_write.c
+++ b/oss_write.c
@@ -61,7 +61,7 @@ static int get_oss_format(enum sample_format sf)
 	}
 }
 
-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;
@@ -71,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)
@@ -101,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);
@@ -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;
@@ -218,7 +218,7 @@ 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;
@@ -245,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,
 };