X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=write_common.c;h=b73ba9a11a753244bf23dc6d5f4a2e05985197cb;hb=009e80ae25df7a247a263b5b8e2259c9bdfe20ce;hp=b92c5f1ca64f04328a482f9105d9280968e7877a;hpb=9609fd30e0d3db45ede3ab5c6bc3a77c15b6aef8;p=paraslash.git

diff --git a/write_common.c b/write_common.c
index b92c5f1c..b73ba9a1 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-2010 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -147,30 +147,30 @@ 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);
+	int ret = btr_exec_up(btrn, cmd, &buf);
 
-	if (ret < 0)
-		return ret;
+	assert(ret >= 0);
 	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.
  */
-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.
  */
-int get_btr_channels(struct btr_node *btrn, int32_t *result)
+void get_btr_channels(struct btr_node *btrn, int32_t *result)
 {
-	return get_btr_value(btrn, "channels", result);
+	get_btr_value(btrn, "channels", result);
 }