input: use an input thread for lirc

input/input.c

@@ -1562,7 +1562,7 @@ struct input_ctx *mp_input_init(struct mpv_global *global)
 
 #if HAVE_LIRC
     if (input_conf->use_lirc)
-        mp_input_lirc_init(ictx, ictx->log, input_conf->lirc_configfile);
+        mp_input_lirc_add(ictx, input_conf->lirc_configfile);
 #endif
 
     if (input_conf->use_alt_gr) {

input/lirc.c

@@ -25,22 +25,21 @@
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <poll.h>
 
 #include "common/msg.h"
 #include "input.h"
 #include "lirc.h"
 
-static int mp_input_lirc_read(void *ctx, int fd,char* dest, int s);
-static int mp_input_lirc_close(void *ctx, int fd);
-
 struct ctx {
     struct mp_log *log;
     struct lirc_config *lirc_config;
     char* cmd_buf;
+    int fd;
 };
 
-int mp_input_lirc_init(struct input_ctx *ictx, struct mp_log *log,
-                       char *lirc_configfile)
+static struct ctx *mp_input_lirc_init(struct input_ctx *ictx, struct mp_log *log,
+                                      char *lirc_configfile)
 {
   int lirc_sock;
   int mode;
@@ -48,14 +47,14 @@ int mp_input_lirc_init(struct input_ctx *ictx, struct mp_log *log,
   mp_verbose(log,"Setting up LIRC support...\n");
   if((lirc_sock=lirc_init("mpv",0))==-1){
     mp_verbose(log,"Failed to open LIRC support. You will not be able to use your remote control.\n");
-    return -1;
+    return NULL;
   }
 
   mode = fcntl(lirc_sock, F_GETFL);
   if (mode < 0 || fcntl(lirc_sock, F_SETFL, mode | O_NONBLOCK) < 0) {
     mp_err(log, "setting non-blocking mode failed: %s\n", strerror(errno));
     lirc_deinit();
-    return -1;
+    return NULL;
   }
 
   struct lirc_config *lirc_config = NULL;
@@ -63,17 +62,16 @@ int mp_input_lirc_init(struct input_ctx *ictx, struct mp_log *log,
     mp_err(log, "Failed to read LIRC config file %s.\n",
                     lirc_configfile == NULL ? "~/.lircrc" : lirc_configfile);
     lirc_deinit();
-    return -1;
+    return NULL;
   }
 
   struct ctx *ctx = talloc_ptrtype(NULL, ctx);
   *ctx = (struct ctx){
       .log = log,
       .lirc_config = lirc_config,
+      .fd = lirc_sock,
   };
-  mp_input_add_fd(ictx, lirc_sock, 1, mp_input_lirc_read, NULL, mp_input_lirc_close, ctx);
-
-  return lirc_sock;
+  return ctx;
 }
 
 static int mp_input_lirc_read(void *pctx,int fd,char* dest, int s) {
@@ -118,11 +116,11 @@ static int mp_input_lirc_read(void *pctx,int fd,char* dest, int s) {
   free(code);
 
   if(r < 0)
-    return MP_INPUT_DEAD;
+    return -1;
   else if(ctx->cmd_buf) // return the first command in the buffer
     return mp_input_lirc_read(ctx,fd,dest,s);
   else
-    return MP_INPUT_RETRY;
+    return 0;
 
 }
 
@@ -132,6 +130,40 @@ static int mp_input_lirc_close(void *pctx,int fd)
   free(ctx->cmd_buf);
   lirc_freeconfig(ctx->lirc_config);
   lirc_deinit();
+  close(fd);
   talloc_free(ctx);
   return 0;
 }
+
+static void read_lirc_thread(struct mp_input_src *src, void *param)
+{
+    int wakeup_fd = mp_input_src_get_wakeup_fd(src);
+    struct ctx *ctx = mp_input_lirc_init(src->input_ctx, src->log, param);
+
+    if (!ctx)
+        return;
+
+    mp_input_src_init_done(src);
+
+    while (1) {
+        struct pollfd fds[2] = {
+            { .fd = ctx->fd, .events = POLLIN },
+            { .fd = wakeup_fd, .events = POLLIN },
+        };
+        poll(fds, 2, -1);
+        if (!(fds[0].revents & POLLIN))
+            break;
+        char buffer[128];
+        int r = mp_input_lirc_read(ctx, ctx->fd, buffer, sizeof(buffer));
+        if (r < 0)
+            break;
+        mp_input_src_feed_cmd_text(src, buffer, r);
+    }
+
+    mp_input_lirc_close(ctx, ctx->fd);
+}
+
+void mp_input_lirc_add(struct input_ctx *ictx, char *lirc_configfile)
+{
+    mp_input_add_thread_src(ictx, (void *)lirc_configfile, read_lirc_thread);
+}

input/lirc.h

@@ -20,8 +20,6 @@
 #define MPLAYER_LIRC_H
 
 struct input_ctx;
-struct mp_log;
-int mp_input_lirc_init(struct input_ctx *ictx, struct mp_log *log,
-                       char *lirc_configfile);
+void mp_input_lirc_add(struct input_ctx *ictx, char *lirc_configfile);
 
 #endif /* MPLAYER_LIRC_H */