X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write_common.c;h=14cc98a4189a5f74907f8bfcf416f62bcc2515c5;hp=d4d1b10b2ec597fa58ecf77dfad82ac01efa5d0c;hb=HEAD;hpb=9d24300965cbcdfddb9f63b6bc8018da50d7d8e1

diff --git a/write_common.c b/write_common.c
index d4d1b10b..9a130905 100644
--- a/write_common.c
+++ b/write_common.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file write_common.c common functions of para_audiod and para_write */
 
@@ -89,7 +85,7 @@ int check_writer_arg_or_die(const char *wa, struct lls_parse_result **lprp)
 	if (!wa || !*wa) {
 		writer_num = default_writer_id();
 		cmd = WRITE_CMD(writer_num);
-		argv = para_malloc(2 * sizeof(char *));
+		argv = alloc(2 * sizeof(char *));
 		argc = 1;
 		argv[0] = para_strdup(lls_command_name(cmd));
 		argv[1] = NULL;
@@ -143,8 +139,8 @@ void register_writer_node(struct writer_node *wn, struct btr_node *parent,
 		.handler = w->execute, .context = wn));
 	wn->task = task_register(&(struct task_info) {
 		.name = writer_name(wn->wid),
-		.pre_select = w->pre_select,
-		.post_select = w->post_select,
+		.pre_monitor = w->pre_monitor,
+		.post_monitor = w->post_monitor,
 		.context = wn,
 	}, s);
 }
@@ -178,24 +174,24 @@ void print_writer_helps(bool detailed)
 	}
 }
 
-static void get_btr_value(struct btr_node *btrn, const char *cmd,
+static int get_btr_value(struct btr_node *btrn, const char *cmd,
 		int32_t *result)
 {
 	char *buf = NULL;
 	int ret = btr_exec_up(btrn, cmd, &buf);
 
-	if (ret < 0) {
-		/*
-		 * This really should not happen. It means one of our parent
-		 * nodes died unexpectedly. Proceed with fingers crossed.
-		 */
-		PARA_CRIT_LOG("cmd %s: %s\n", cmd, para_strerror(-ret));
-		*result = 0;
-		return;
-	}
+	*result = 0;
+	/*
+	 * Errors may happen when the decoder returns EOF before the writer had
+	 * a chance to query the buffer tree for the channel count, sample rate
+	 * etc.
+	 */
+	if (ret < 0)
+		return ret;
 	ret = para_atoi32(buf, result);
 	assert(ret >= 0);
 	free(buf);
+	return ret;
 }
 
 /**
@@ -204,11 +200,11 @@ static void get_btr_value(struct btr_node *btrn, const char *cmd,
  * \param btrn Where to start the search.
  * \param result Filled in by this function.
  *
- * This function is assumed to succeed and terminates on errors.
+ * \return Standard.
  */
-void get_btr_sample_rate(struct btr_node *btrn, int32_t *result)
+int get_btr_sample_rate(struct btr_node *btrn, int32_t *result)
 {
-	get_btr_value(btrn, "sample_rate", result);
+	return get_btr_value(btrn, "sample_rate", result);
 }
 
 /**
@@ -216,10 +212,12 @@ void get_btr_sample_rate(struct btr_node *btrn, int32_t *result)
  *
  * \param btrn See \ref get_btr_sample_rate.
  * \param result See \ref get_btr_sample_rate.
+ *
+ * \return Standard.
  */
-void get_btr_channels(struct btr_node *btrn, int32_t *result)
+int get_btr_channels(struct btr_node *btrn, int32_t *result)
 {
-	get_btr_value(btrn, "channels", result);
+	return get_btr_value(btrn, "channels", result);
 }
 
 /**
@@ -227,8 +225,10 @@ void get_btr_channels(struct btr_node *btrn, int32_t *result)
  *
  * \param btrn See \ref get_btr_sample_rate.
  * \param result Contains the sample format as an enum sample_format type.
+ *
+ * \return Standard.
  */
-void get_btr_sample_format(struct btr_node *btrn, int32_t *result)
+int get_btr_sample_format(struct btr_node *btrn, int32_t *result)
 {
-	get_btr_value(btrn, "sample_format", result);
+	return get_btr_value(btrn, "sample_format", result);
 }