X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=write_common.c;h=0d30eb8018583b278d79ef6df40a02bb2d771053;hb=1c859dfc274c592eca267197131d6497b650b24c;hp=b05a9e9839e8e5bf6e37531f81307cb8a08318dc;hpb=7d473d0025bc76374f55ca2b135b6e2f70ae4a1e;p=paraslash.git

diff --git a/write_common.c b/write_common.c
index b05a9e98..0d30eb80 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.
  */
@@ -81,12 +81,14 @@ void register_writer_node(struct writer_node *wn, struct btr_node *parent)
 	char *name = make_message("%s writer", writer_names[wn->writer_num]);
 	int ret;
 
-	wn->btrn = btr_new_node(name, parent, w->execute, wn);
+	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_btr;
-	wn->task.pre_select = w->pre_select_btr;
+	wn->task.post_select = w->post_select;
+	wn->task.pre_select = w->pre_select;
 	register_task(&wn->task);
 }
 
@@ -158,11 +160,11 @@ static int get_btr_value(struct btr_node *btrn, const char *key, int32_t *result
 }
 
 /*
- * 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)
+int get_btr_sample_rate(struct btr_node *btrn, int32_t *result)
 {
-	return get_btr_value(btrn, "samplerate", result);
+	return get_btr_value(btrn, "sample_rate", result);
 }
 
 /*