X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv.c;h=0875d17d0dd0ebba5141f7db53be474f89597924;hp=423ccbc2c074bcd8a1f95a0c3614f3cbf4763d5b;hb=c73d23911d78ed10179c12ef8f79a3fcf3bbcdaf;hpb=471684761a2039bbc89aa1e3c33c62de6bef86cf diff --git a/recv.c b/recv.c index 423ccbc2..0875d17d 100644 --- a/recv.c +++ b/recv.c @@ -6,8 +6,10 @@ /** \file recv.c the stand-alone audio stream receiver */ -#include "para.h" +#include +#include +#include "para.h" #include "list.h" #include "sched.h" #include "recv.h" @@ -46,8 +48,8 @@ static void *parse_config(int argc, char *argv[], int *receiver_num) static void rn_event_handler(struct task *t) { struct receiver_node *rn = t->private_data; - PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret)); - rn->eof = 1; + PARA_NOTICE_LOG("%s\n", para_strerror(-t->ret)); + rn->error = t->ret; unregister_task(t); } @@ -92,7 +94,7 @@ int main(int argc, char *argv[]) stdout_set_defaults(&sot); sot.buf = rn.buf; sot.loaded = &rn.loaded; - sot.input_eof = &rn.eof; + sot.input_error = &rn.error; register_task(&sot.task); rn.task.private_data = &rn; @@ -102,13 +104,13 @@ int main(int argc, char *argv[]) sprintf(rn.task.status, "receiver node"); register_task(&rn.task); - ret = sched(&s); + ret = schedule(&s); out: if (r_opened) r->close(&rn); if (r) r->shutdown(); if (ret < 0) - PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret)); + PARA_ERROR_LOG("%s\n", para_strerror(-ret)); return ret < 0? EXIT_FAILURE : EXIT_SUCCESS; }