X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv.c;h=a37e4d08dc0be08d1c092cfd3156b5b413de9d3b;hp=5de9c6be1779855b00a4698b6638aa4d67072305;hb=618a25011420f434f05305a4053a49824d39b4a2;hpb=343f3c63fc3a7f9ca4ba4163c9e4cf06cde8d0c3

diff --git a/recv.c b/recv.c
index 5de9c6be..a37e4d08 100644
--- a/recv.c
+++ b/recv.c
@@ -1,27 +1,34 @@
 /*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file recv.c the stand-alone audio stream receiver */
 
+#include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
 
 #include "para.h"
 #include "list.h"
 #include "sched.h"
 #include "ggo.h"
+#include "buffer_tree.h"
 #include "recv.h"
 #include "recv.cmdline.h"
 #include "fd.h"
 #include "string.h"
 #include "error.h"
 #include "stdout.h"
+#include "version.h"
 
-/** the gengetopt args info struct */
-struct recv_args_info conf;
+extern void afh_recv_init(struct receiver *r);
+#undef AFH_RECEIVER
+#define AFH_RECEIVER {.name = "afh", .init = afh_recv_init},
+DEFINE_RECEIVER_ARRAY;
+
+/** The gengetopt args info struct. */
+static struct recv_args_info conf;
 
 static int loglevel;
 /** Always log to stderr. */
@@ -52,11 +59,12 @@ static void *parse_config(int argc, char *argv[], int *receiver_num)
 	HANDLE_VERSION_FLAG("recv", conf);
 	if (conf.help_given || conf.detailed_help_given)
 		print_help_and_die();
+	loglevel = get_loglevel_by_name(conf.loglevel_arg);
 	return check_receiver_arg(conf.receiver_arg, receiver_num);
 }
 
 /**
- * the main function of para_recv
+ * The main function of para_recv.
  *
  * \param argc number of arguments
  * \param argv vector of arguments
@@ -86,31 +94,34 @@ int main(int argc, char *argv[])
 		PARA_EMERG_LOG("parse failed\n");
 		goto out;
 	}
-	loglevel = get_loglevel_by_name(conf.loglevel_arg);
 	r = &receivers[receiver_num];
 	rn.receiver = r;
+	rn.btrn = btr_new_node(&(struct btr_node_description)
+		EMBRACE(.name = r->name));
 	ret = r->open(&rn);
 	if (ret < 0)
 		goto out;
 	r_opened = 1;
 
+	sot.btrn = btr_new_node(&(struct btr_node_description)
+		EMBRACE(.parent = rn.btrn, .name = "stdout"));
 	stdout_set_defaults(&sot);
-	sot.bufp = &rn.buf;
-	sot.loaded = &rn.loaded;
-	sot.input_error = &rn.task.error;
-	register_task(&sot.task);
+	register_task(&s, &sot.task);
 
 	rn.task.pre_select = r->pre_select;
 	rn.task.post_select = r->post_select;
-	sprintf(rn.task.status, "receiver node");
-	register_task(&rn.task);
+	sprintf(rn.task.status, "%s", r->name);
+	register_task(&s, &rn.task);
 
 	ret = schedule(&s);
 out:
 	if (r_opened)
 		r->close(&rn);
-	if (r)
-		r->shutdown();
+	btr_remove_node(&rn.btrn);
+	btr_remove_node(&sot.btrn);
+	if (rn.conf)
+		r->free_config(rn.conf);
+
 	if (ret < 0)
 		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 	return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;