X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv.c;h=d01dab68847fc93912edb7e9c7a1e873cf11a1e5;hp=df8b9ce99e445f3acce568486c02878276f03576;hb=c9c96581d5a29830f555079e861dcac8d48722d5;hpb=00e4d4da1b2c00da139b09d3ed4ab9ad9fba2691 diff --git a/recv.c b/recv.c index df8b9ce9..d01dab68 100644 --- a/recv.c +++ b/recv.c @@ -6,6 +6,7 @@ /** \file recv.c the stand-alone audio stream receiver */ +#include #include #include @@ -52,6 +53,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 +81,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); @@ -96,7 +96,7 @@ int main(int argc, char *argv[]) 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);