/*
- * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2009 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 <stdbool.h>
#include "para.h"
#include "list.h"
#include "recv.h"
#include "recv.cmdline.h"
#include "fd.h"
+#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;
-/** always log to stderr */
-INIT_STDERR_LOGGING(conf.loglevel_arg);
+static int loglevel;
+/** Always log to stderr. */
+INIT_STDERR_LOGGING(loglevel);
/** init array of error codes used by para_recv */
INIT_RECV_ERRLISTS;
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);
}
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) {
}
r = &receivers[receiver_num];
rn.receiver = r;
+ if (conf.buffer_tree_given)
+ rn.btrn = btr_new_node("receiver", NULL, NULL, NULL);
ret = r->open(&rn);
if (ret < 0)
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);
out:
if (r_opened)
r->close(&rn);
+ if (conf.buffer_tree_given) {
+ btr_free_node(rn.btrn);
+ btr_free_node(sot.btrn);
+ }
+ free(rn.conf);
if (r)
r->shutdown();
if (ret < 0)