REQUIREMENTS: Kill an incomplete sentence, add git.

[paraslash.git] / recv.c

diff --git a/recv.c b/recv.c
index af15eb07efb005f8b959e764d74b1bf2a27db60d..3a3d142692aeab0018c13770d7eab1a94502cccc 100644 (file)
--- a/recv.c
+++ b/recv.c
@@ -1,49 +1,39 @@
 /*
- * 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
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
-#include "para.h"
 
+/** \file recv.c the stand-alone audio stream receiver */
+
+#include <sys/types.h>
+#include <dirent.h>
+
+#include "para.h"
+#include "list.h"
+#include "sched.h"
 #include "recv.h"
 #include "recv.cmdline.h"
 #include "fd.h"
 #include "error.h"
+#include "stdout.h"
 
-struct gengetopt_args_info conf;
+/** the gengetopt args info struct */
+struct recv_args_info conf;
 
-INIT_RECV_ERRLISTS;
+/** always log to stderr */
+INIT_STDERR_LOGGING(conf.loglevel_arg);
 
-__printf_2_3 void para_log(int ll, const char* fmt,...)
-{
-       va_list argp;
-
-       /* 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)
 {
        int i;
 
-       if (cmdline_parser(argc, argv, &conf))
+       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++)
@@ -55,13 +45,35 @@ static void *parse_config(int argc, char *argv[], int *receiver_num)
        return check_receiver_arg(conf.receiver_arg, 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;
+       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, eof = 0, max, r_opened = 0, receiver_num;
-       struct timeval timeout;
-       struct  receiver *r = NULL;
-       fd_set rfds, wfds;
+       int ret, r_opened = 0, receiver_num;
+       struct receiver *r = NULL;
        struct receiver_node rn;
+       struct stdout_task sot;
+       struct sched s;
+
+       s.default_timeout.tv_sec = 1;
+       s.default_timeout.tv_usec = 0;
 
        memset(&rn, 0, sizeof(struct receiver_node));
        for (ret = 0; receivers[ret].name; ret++)
@@ -78,44 +90,21 @@ int main(int argc, char *argv[])
        if (ret < 0)
                goto out;
        r_opened = 1;
-recv:
-       FD_ZERO(&rfds);
-       FD_ZERO(&wfds);
-       timeout.tv_sec = 0;
-       timeout.tv_usec = 999 * 1000;
-       max = -1;
-       ret = r->pre_select(&rn, &rfds, &wfds, &timeout);
-       max = PARA_MAX(max, ret);
 
-       PARA_DEBUG_LOG("timeout: %lums, max: %d\n", tv2ms(&timeout), max);
-       ret = para_select(max + 1, &rfds, &wfds, &timeout);
-       if (ret < 0) {
-               ret = -E_RECV_SELECT;
-               goto out;
-       }
-       ret = r->post_select(&rn, ret, &rfds, &wfds);
-       if (ret < 0)
-               goto out;
-       if (!ret)
-               eof = 1;
-       if (!rn.loaded) {
-               if (eof)
-                       goto out;
-               goto recv;
-       }
-       ret = write(STDOUT_FILENO, rn.buf, rn.loaded);
-       PARA_DEBUG_LOG("wrote %d/%zd\n", ret, rn.loaded);
-       if (ret < 0) {
-               ret = -E_WRITE_STDOUT;
-               goto out;
-       }
-       if (ret != rn.loaded) {
-               PARA_INFO_LOG("short write %d/%zd\n", ret, rn.loaded);
-               memmove(rn.buf, rn.buf + ret, rn.loaded - ret);
-       }
-       rn.loaded -= ret;
-       if (rn.loaded || !eof)
-               goto recv;
+       stdout_set_defaults(&sot);
+       sot.buf = rn.buf;
+       sot.loaded = &rn.loaded;
+       sot.input_eof = &rn.eof;
+       register_task(&sot.task);
+
+       rn.task.private_data = &rn;
+       rn.task.pre_select = r->pre_select;
+       rn.task.post_select = r->post_select;
+       rn.task.event_handler = rn_event_handler;
+       sprintf(rn.task.status, "receiver node");
+       register_task(&rn.task);
+
+       ret = sched(&s);
 out:
        if (r_opened)
                r->close(&rn);
@@ -123,5 +112,5 @@ out:
                r->shutdown();
        if (ret < 0)
                PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
-       return ret;
+       return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;
 }