X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv.c;h=1bb0532a9f51622e645bd69074b19504be9068f6;hp=4f595e39aae21cbef207fc1418c5973d0fbd68a1;hb=4b694c91983ce8c70562a8fa1d897e426f8e870b;hpb=56955f95584f51709320262f7d2e0ea79301d346

diff --git a/recv.c b/recv.c
index 4f595e39..1bb0532a 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);
 }
 
@@ -86,16 +90,16 @@ 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("receiver", NULL /* no parent */);
 	ret = r->open(&rn);
 	if (ret < 0)
 		goto out;
 	r_opened = 1;
 
 	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);
@@ -107,8 +111,10 @@ int main(int argc, char *argv[])
 
 	ret = schedule(&s);
 out:
-	if (r_opened)
+	if (r_opened) {
+		btr_del_node(rn.btrn);
 		r->close(&rn);
+	}
 	if (r)
 		r->shutdown();
 	if (ret < 0)