X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv.c;h=a7a957dddde4188381ec042896f75792d965402e;hp=bfc7a45d3572fb7c02e19cf9608883723df95e38;hb=5430c77f1fdf97d92796f44623d257b8124bde24;hpb=786010c598f79d20280e6ea9ea458cad4a7e9af7

diff --git a/recv.c b/recv.c
index bfc7a45d..a7a957dd 100644
--- a/recv.c
+++ b/recv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
  *
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
@@ -15,6 +15,9 @@
  *     along with this program; if not, write to the Free Software
  *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  */
+
+/** \file recv.c the stand-alone audio stream receiver */
+
 #include "para.h"
 
 #include "list.h"
@@ -25,21 +28,14 @@
 #include "error.h"
 #include "stdout.h"
 
+/** the gengetopt args info struct */
 struct recv_args_info conf;
 
-INIT_RECV_ERRLISTS;
-
-__printf_2_3 void para_log(int ll, const char* fmt,...)
-{
-	va_list argp;
+/** always log to stderr */
+INIT_STDERR_LOGGING(conf.loglevel_arg);
 
-	/* ignore log message if loglevel is not high enough */
-	if (ll < conf.loglevel_arg)
-		return;
-	va_start(argp, fmt);
-	vfprintf(stderr, fmt, argp);
-	va_end(argp);
-}
+/** init array of error codes used by para_recv */
+INIT_RECV_ERRLISTS;
 
 static void *parse_config(int argc, char *argv[], int *receiver_num)
 {
@@ -47,6 +43,7 @@ static void *parse_config(int argc, char *argv[], int *receiver_num)
 
 	if (recv_cmdline_parser(argc, argv, &conf))
 		return NULL;
+	HANDLE_VERSION_FLAG("recv", conf);
 	if (conf.list_receivers_given) {
 		printf("available receivers: ");
 		for (i = 0; receivers[i].name; i++)
@@ -58,16 +55,29 @@ static void *parse_config(int argc, char *argv[], int *receiver_num)
 	return check_receiver_arg(conf.receiver_arg, receiver_num);
 }
 
-void rn_event_handler(struct task *t)
+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;
 	unregister_task(t);
 }
 
+/**
+ * the main function of para_recv
+ *
+ * \param argc number of arguments
+ * \param argv vector of arguments
+ *
+ * para_recv uses the specified receiver to receive an audio stream sent by
+ * para_server. The received data is written to stdout.
+ *
+ * \return \a EXIT_SUCCESS on success, \a EXIT_FAILURE on errors.
+ */
 int main(int argc, char *argv[])
 {
 	int ret, r_opened = 0, receiver_num;
-	struct	receiver *r = NULL;
+	struct receiver *r = NULL;
 	struct receiver_node rn;
 	struct stdout_task sot;
 	struct sched s;
@@ -104,7 +114,6 @@ int main(int argc, char *argv[])
 	sprintf(rn.task.status, "receiver node");
 	register_task(&rn.task);
 
-
 	ret = sched(&s);
 out:
 	if (r_opened)
@@ -113,5 +122,5 @@ out:
 		r->shutdown();
 	if (ret < 0)
 		PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
-	return ret;
+	return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;
 }