paraslash 0.7.3

[paraslash.git] / recv.c

diff --git a/recv.c b/recv.c
index 9842c7dc8f168fe5e4cd3daf2ee0d9f3f34df358..68417187348b058b375993b9a74eb6c2ca7d826b 100644 (file)
--- a/recv.c
+++ b/recv.c
@@ -1,14 +1,9 @@
-/*
- * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file recv.c the stand-alone audio stream receiver */
 
 #include <regex.h>
 #include <sys/types.h>
-#include <inttypes.h>
 #include <lopsub.h>
 
 #include "recv_cmd.lsg.h"
@@ -84,7 +79,6 @@ int main(int argc, char *argv[])
        loglevel = OPT_UINT32_VAL(LOGLEVEL, lpr);
        version_handle_flag("recv", OPT_GIVEN(VERSION, lpr));
        handle_help_flag(lpr);
-       recv_init();
        memset(&rn, 0, sizeof(struct receiver_node));
        ret = check_receiver_arg(OPT_STRING_VAL(RECEIVER, lpr), &receiver_lpr);
        if (ret < 0)
@@ -103,13 +97,12 @@ int main(int argc, char *argv[])
        stdout_task_register(&sot, &s);
 
        ti.name = lls_command_name(cmd);
-       ti.pre_select = r->pre_select;
-       ti.post_select = r->post_select;
+       ti.pre_monitor = r->pre_monitor;
+       ti.post_monitor = r->post_monitor;
        ti.context = &rn;
        rn.task = task_register(&ti, &s);
 
-       s.default_timeout.tv_sec = 1;
-       s.default_timeout.tv_usec = 0;
+       s.default_timeout = 1000;
        ret = schedule(&s);
        sched_shutdown(&s);
        r->close(&rn);