X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.c;h=416408a1f4cfe606d858ea833f4531225c3d90db;hp=103f2acc97c1cb781226c9192dacf42899c060c8;hb=d6f52cebbb178c884ba54ea782efa56a009493db;hpb=f1401e9c2d74154a81d16e2d1a2413e7125abb15

diff --git a/write.c b/write.c
index 103f2acc..416408a1 100644
--- a/write.c
+++ b/write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -74,13 +74,13 @@ static int check_wav_exec(struct btr_node *btrn, const char *cmd, char **result)
 
 	if (!strcmp(cmd, "samplerate")) {
 		if (cwt->state != CWS_HAVE_HEADER)
-			return -ERRNO_TO_PARA_ERROR(ENAVAIL);
+			return -E_BTR_NAVAIL;
 		*result = make_message("%d", cwt->samplerate);
 		return 1;
 	}
 	if (!strcmp(cmd, "channels")) {
 		if (cwt->state != CWS_HAVE_HEADER)
-			return -ERRNO_TO_PARA_ERROR(ENAVAIL);
+			return -E_BTR_NAVAIL;
 		*result = make_message("%d", cwt->channels);
 		return 1;
 	}
@@ -154,14 +154,17 @@ static int main_btr(struct sched *s)
 	struct writer_node *wns;
 
 	loglevel = get_loglevel_by_name(conf.loglevel_arg);
-	sit.btrn = btr_new_node("stdin", NULL /* stdin has no parent */, NULL, NULL);
+	sit.btrn = btr_new_node(&(struct btr_node_description)
+		EMBRACE(.name = "stdin"));
 	stdin_set_defaults(&sit);
 	register_task(&sit.task);
 
 	cwt->state = CWS_NEED_HEADER;
 	cwt->min_iqs = WAV_HEADER_LEN;
-	cwt->btrn = btr_new_node("check wav", sit.btrn, check_wav_exec, cwt);
-	sprintf(cwt->task.status, "check wav");
+	cwt->btrn = btr_new_node(&(struct btr_node_description)
+		EMBRACE(.name = "check_wav", .parent = sit.btrn,
+		.handler = check_wav_exec, .context = cwt));
+	sprintf(cwt->task.status, "check_wav");
 	cwt->task.pre_select = check_wav_pre_select;
 	cwt->task.post_select = check_wav_post_select;
 	cwt->task.error = 0;