X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=alsa_write.c;h=53d7b1b454932c36b3e578d794d688cee6cf7270;hb=refs%2Fheads%2Fnext;hp=192233442b7346278634e749567d898dda5d05a8;hpb=bb899fb1a0c279a2890ff30d11bf7aec50fb92ed;p=paraslash.git

diff --git a/alsa_write.c b/alsa_write.c
index 19223344..53d7b1b4 100644
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -48,7 +48,7 @@ struct private_alsa_write_data {
 	/* time until buffer underrun occurs, in milliseconds */
 	unsigned buffer_time;
 	struct timeval drain_barrier;
-	/* File descriptor for select(). */
+	/* File descriptor to monitor for reading. */
 	int poll_fd;
 };
 
@@ -202,7 +202,7 @@ out:
 	return ret;
 }
 
-static void alsa_write_pre_select(struct sched *s, void *context)
+static void alsa_write_pre_monitor(struct sched *s, void *context)
 {
 	struct pollfd pfd;
 	struct writer_node *wn = context;
@@ -254,7 +254,7 @@ free_pad:
 	free(pad);
 }
 
-static int alsa_write_post_select(__a_unused struct sched *s, void *context)
+static int alsa_write_post_monitor(__a_unused struct sched *s, void *context)
 {
 	struct writer_node *wn = context;
 	struct private_alsa_write_data *pad = wn->private_data;
@@ -277,7 +277,7 @@ again:
 	bytes = btr_next_buffer(btrn, &data);
 	if (ret < 0 || bytes < wn->min_iqs) { /* eof */
 		assert(btr_no_parent(btrn));
-		ret = -E_WRITE_COMMON_EOF;
+		ret = -E_EOF;
 		if (!pad)
 			goto err;
 		/* wait until pending frames are played */
@@ -296,7 +296,7 @@ again:
 
 		if (bytes == 0) /* no data available */
 			return 0;
-		pad = wn->private_data = para_calloc(sizeof(*pad));
+		pad = wn->private_data = zalloc(sizeof(*pad));
 		ret = get_btr_sample_rate(btrn, &val);
 		if (ret < 0)
 			goto err;
@@ -349,7 +349,7 @@ err:
 
 struct writer lsg_write_cmd_com_alsa_user_data = {
 
-	.pre_select = alsa_write_pre_select,
-	.post_select = alsa_write_post_select,
+	.pre_monitor = alsa_write_pre_monitor,
+	.post_monitor = alsa_write_post_monitor,
 	.close = alsa_close,
 };