X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv.c;h=c8edb5936e231d493c4f801456eeecb6a2a0da7a;hp=df8b9ce99e445f3acce568486c02878276f03576;hb=aa234b7afe223879a7bd7274ce05a3a315a2ec49;hpb=00e4d4da1b2c00da139b09d3ed4ab9ad9fba2691

diff --git a/recv.c b/recv.c
index df8b9ce9..c8edb593 100644
--- a/recv.c
+++ b/recv.c
@@ -6,8 +6,10 @@
 
 /** \file recv.c the stand-alone audio stream receiver */
 
+#include <regex.h>
 #include <sys/types.h>
 #include <dirent.h>
+#include <stdbool.h>
 
 #include "para.h"
 #include "list.h"
@@ -19,9 +21,10 @@
 #include "string.h"
 #include "error.h"
 #include "stdout.h"
+#include "buffer_tree.h"
 
-/** the gengetopt args info struct */
-struct recv_args_info conf;
+/** The gengetopt args info struct. */
+static struct recv_args_info conf;
 
 static int loglevel;
 /** Always log to stderr. */
@@ -52,6 +55,7 @@ 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);
 }
 
@@ -79,15 +83,13 @@ int main(int argc, char *argv[])
 
 	memset(&sot, 0, sizeof(struct stdout_task));
 	memset(&rn, 0, sizeof(struct receiver_node));
-	FOR_EACH_RECEIVER(ret)
-		receivers[ret].init(&receivers[ret]);
+	recv_init();
 	ret = -E_RECV_SYNTAX;
 	rn.conf = parse_config(argc, argv, &receiver_num);
 	if (!rn.conf) {
 		PARA_EMERG_LOG("parse failed\n");
 		goto out;
 	}
-	loglevel = get_loglevel_by_name(conf.loglevel_arg);
 	r = &receivers[receiver_num];
 	rn.receiver = r;
 	ret = r->open(&rn);
@@ -95,8 +97,11 @@ int main(int argc, char *argv[])
 		goto out;
 	r_opened = 1;
 
+	if (conf.buffer_tree_given)
+		sot.btrn = btr_new_node("stdout", rn.btrn, NULL, NULL);
+
 	stdout_set_defaults(&sot);
-	sot.buf = rn.buf;
+	sot.bufp = &rn.buf;
 	sot.loaded = &rn.loaded;
 	sot.input_error = &rn.task.error;
 	register_task(&sot.task);
@@ -108,6 +113,8 @@ int main(int argc, char *argv[])
 
 	ret = schedule(&s);
 out:
+	if (conf.buffer_tree_given)
+		btr_free_node(sot.btrn);
 	if (r_opened)
 		r->close(&rn);
 	if (r)