X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv.c;h=55e97f1e49ed6248ec415598d95762ee9f3f82fa;hp=423ccbc2c074bcd8a1f95a0c3614f3cbf4763d5b;hb=53a27fb91166a7734f0768721b2cef91f0f6172e;hpb=471684761a2039bbc89aa1e3c33c62de6bef86cf

diff --git a/recv.c b/recv.c
index 423ccbc2..55e97f1e 100644
--- a/recv.c
+++ b/recv.c
@@ -1,13 +1,15 @@
 /*
- * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2008 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 "para.h"
+#include <sys/types.h>
+#include <dirent.h>
 
+#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);
 }
 
@@ -79,7 +81,7 @@ int main(int argc, char *argv[])
 	ret = -E_RECV_SYNTAX;
 	rn.conf = parse_config(argc, argv, &receiver_num);
 	if (!rn.conf) {
-		PARA_EMERG_LOG("%s", "parse failed\n");
+		PARA_EMERG_LOG("parse failed\n");
 		goto out;
 	}
 	r = &receivers[receiver_num];
@@ -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;
 }