X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=ao_write.c;h=cc1a4f0facd58e738976600a653266a6066556f8;hb=refs%2Fheads%2Fpu;hp=447dea84c00a468330fe8229bfd70b74292264bd;hpb=d5e27e2a346da2f18188d317926a60687d082732;p=paraslash.git

diff --git a/ao_write.c b/ao_write.c
index 447dea84..cc1a4f0f 100644
--- a/ao_write.c
+++ b/ao_write.c
@@ -42,7 +42,7 @@ static void aow_close(struct writer_node *wn)
 	ao_shutdown();
 }
 
-static void aow_pre_select(struct sched *s, void *context)
+static void aow_pre_monitor(struct sched *s, void *context)
 {
 	struct writer_node *wn = context;
 	struct private_aow_data *pawd = wn->private_data;
@@ -87,6 +87,8 @@ static int aow_set_sample_format(unsigned sample_rate, unsigned channels,
 		case SF_U8:
 		case SF_U16_LE:
 		case SF_U16_BE:
+		case SF_FLOAT_LE:
+		case SF_FLOAT_BE:
 			return -E_BAD_SAMPLE_FORMAT;
 		case SF_S8:
 			/* no need to set byte_format */
@@ -184,7 +186,7 @@ static int aow_init(struct writer_node *wn, unsigned sample_rate,
 	ao_info *info;
 	const struct lls_opt_result *r;
 	unsigned n;
-	struct private_aow_data *pawd = para_malloc(sizeof(*pawd));
+	struct private_aow_data *pawd = alloc(sizeof(*pawd));
 
 	ao_initialize();
 	aow_show_drivers();
@@ -266,7 +268,7 @@ static void *aow_play(void *priv)
 				if (frames > 0)
 					break;
 				/* eof and less than a single frame available */
-				ret = -E_WRITE_COMMON_EOF;
+				ret = -E_EOF;
 				goto fail;
 			}
 			/*
@@ -342,7 +344,7 @@ fail:
 	return -E_AO_PTHREAD;
 }
 
-static int aow_post_select(__a_unused struct sched *s, void *context)
+static int aow_post_monitor(__a_unused struct sched *s, void *context)
 {
 	struct writer_node *wn = context;
 	struct private_aow_data *pawd = wn->private_data;
@@ -357,9 +359,15 @@ static int aow_post_select(__a_unused struct sched *s, void *context)
 			goto remove_btrn;
 		if (ret == 0)
 			return 0;
-		get_btr_sample_rate(wn->btrn, &rate);
-		get_btr_channels(wn->btrn, &ch);
-		get_btr_sample_format(wn->btrn, &format);
+		ret = get_btr_sample_rate(wn->btrn, &rate);
+		if (ret < 0)
+			goto remove_btrn;
+		ret = get_btr_channels(wn->btrn, &ch);
+		if (ret < 0)
+			goto remove_btrn;
+		ret = get_btr_sample_format(wn->btrn, &format);
+		if (ret < 0)
+			goto remove_btrn;
 		ret = aow_init(wn, rate, ch, format);
 		if (ret < 0)
 			goto remove_btrn;
@@ -382,7 +390,7 @@ static int aow_post_select(__a_unused struct sched *s, void *context)
 	if (!wn->btrn) {
 		if (!pawd->thread_btrn) {
 			pthread_join(pawd->thread, NULL);
-			return -E_AO_EOF;
+			return -E_EOF;
 		}
 		PARA_INFO_LOG("waiting for play thread to terminate\n");
 		return 0;
@@ -415,7 +423,7 @@ out:
 
 struct writer lsg_write_cmd_com_ao_user_data = {
 	.close = aow_close,
-	.pre_select = aow_pre_select,
-	.post_select = aow_post_select,
+	.pre_monitor = aow_pre_monitor,
+	.post_monitor = aow_post_monitor,
 };