X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write_common.c;h=5988faf77a5cd13f1b4e1930299b8c90073efc3d;hp=b92c5f1ca64f04328a482f9105d9280968e7877a;hb=a22e734cd89015a71d0dd7cf895799c440805847;hpb=eecc102ad0abeb0335fe994bb72031a15b9090d7;ds=sidebyside

diff --git a/write_common.c b/write_common.c
index b92c5f1c..5988faf7 100644
--- a/write_common.c
+++ b/write_common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -66,27 +66,32 @@ void *check_writer_arg(const char *wa, int *writer_num)
 		c = wa[len];
 		if (c && c != ' ')
 			continue;
-		if (c && !writers[i].parse_config)
-			return NULL;
 		*writer_num = i;
-		return writers[i].parse_config(c? wa + len + 1 : "");
+		return writers[i].parse_config_or_die(c? wa + len + 1 : "");
 	}
 	PARA_ERROR_LOG("writer not found\n");
 	return NULL;
 }
 
+/**
+ * Open a writer node and register the corresponding task.
+ *
+ * \param wn The writer node to open.
+ * \param parent The parent btr node (the source for the writer node).
+ *
+ * The configuration of the writer node stored in \p wn->conf must be
+ * initialized before this function may be called.
+ */
 void register_writer_node(struct writer_node *wn, struct btr_node *parent)
 {
 	struct writer *w = writers + wn->writer_num;
 	char *name = make_message("%s writer", writer_names[wn->writer_num]);
-	int ret;
 
 	wn->btrn = btr_new_node(&(struct btr_node_description)
 		EMBRACE(.name = name, .parent = parent,
 		.handler = w->execute, .context = wn));
 	strcpy(wn->task.status, name);
 	free(name);
-	ret = w->open(wn);
 	wn->task.post_select = w->post_select;
 	wn->task.pre_select = w->pre_select;
 	register_task(&wn->task);
@@ -115,7 +120,7 @@ int setup_writer_node(const char *arg, struct btr_node *parent,
 		wn->conf = check_writer_arg(arg, &wn->writer_num);
 	else {
 		wn->writer_num = DEFAULT_WRITER;
-		wn->conf = writers[DEFAULT_WRITER].parse_config("");
+		wn->conf = writers[DEFAULT_WRITER].parse_config_or_die("");
 	}
 	if (!wn->conf)
 		return -E_WRITE_COMMON_SYNTAX;
@@ -123,7 +128,6 @@ int setup_writer_node(const char *arg, struct btr_node *parent,
 	return 1;
 }
 
-
 /**
  * Print the help text of all writers to stdout.
  *
@@ -147,30 +151,57 @@ void print_writer_helps(int detailed)
 	}
 }
 
-static int get_btr_value(struct btr_node *btrn, const char *key, int32_t *result)
+static void get_btr_value(struct btr_node *btrn, const char *cmd,
+		int32_t *result)
 {
 	char *buf = NULL;
-	int ret = btr_exec_up(btrn, key, &buf);
-
-	if (ret < 0)
-		return ret;
+	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;
+	}
 	ret = para_atoi32(buf, result);
+	assert(ret >= 0);
 	free(buf);
-	return ret;
 }
 
-/*
- * Ask parent btr nodes for the samplerate of the current stream.
+/**
+ * Ask parent btr nodes for the sample rate of the current stream.
+ *
+ * \param btrn Where to start the search.
+ * \param result Filled in by this function.
+ *
+ * This function is assumed to succeed and terminates on errors.
  */
-int get_btr_samplerate(struct btr_node *btrn, int32_t *result)
+void get_btr_sample_rate(struct btr_node *btrn, int32_t *result)
 {
-	return get_btr_value(btrn, "samplerate", result);
+	get_btr_value(btrn, "sample_rate", result);
 }
 
-/*
+/**
  * Ask parent btr nodes for the channel count of the current stream.
+ *
+ * \param btrn See \ref get_btr_sample_rate.
+ * \param result See \ref get_btr_sample_rate.
+ */
+void get_btr_channels(struct btr_node *btrn, int32_t *result)
+{
+	get_btr_value(btrn, "channels", result);
+}
+
+/**
+ * Ask parent btr nodes for the number of bits per sample and the byte sex.
+ *
+ * \param btrn See \ref get_btr_sample_rate.
+ * \param result Contains the sample format as an enum sample_format type.
  */
-int get_btr_channels(struct btr_node *btrn, int32_t *result)
+void get_btr_sample_format(struct btr_node *btrn, int32_t *result)
 {
-	return get_btr_value(btrn, "channels", result);
+	get_btr_value(btrn, "sample_format", result);
 }