Replace the per-iop input_timeout by per-function timeouts

[empserver] / src / lib / player / recvclient.c

diff --git a/src/lib/player/recvclient.c b/src/lib/player/recvclient.c
index ed26acfa35fe0bf698dcf12c192c7b28d3dcde58..33c3cbbe53ef9bef39ae424215f77f15db74f739 100644 (file)
--- a/src/lib/player/recvclient.c
+++ b/src/lib/player/recvclient.c
@@ -36,6 +36,7 @@
 
 #include "empio.h"
 #include "journal.h"
+#include "optlist.h"
 #include "player.h"
 #include "prototypes.h"
 
@@ -60,6 +61,7 @@ int
 recvclient(char *cmd, int size)
 {
     int count, res;
+    struct timeval timeout;
 
     count = -1;
     while (!player->aborted) {
@@ -90,7 +92,9 @@ recvclient(char *cmd, int size)
        if (player->aborted)
            break;
 
-       res = io_input(player->iop, 1);
+       timeout.tv_sec = minutes(max_idle);
+       timeout.tv_usec = 0;
+       res = io_input(player->iop, &timeout);
        if (res > 0)
            ;
        else if (res < 0)