summaryrefslogtreecommitdiffstats
path: root/input
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-03-24 15:53:36 +0100
committerwm4 <wm4@nowhere>2015-03-24 16:04:44 +0100
commit1e659a9f0f3a3836912c66ab75b5af38e632ef12 (patch)
tree9b2774cde48b1b89b27df323fcf4c1c1ea6ea327 /input
parentd5318e5e095f3ef831b5251b554ce790da3c40c7 (diff)
downloadmpv-1e659a9f0f3a3836912c66ab75b5af38e632ef12.tar.bz2
mpv-1e659a9f0f3a3836912c66ab75b5af38e632ef12.tar.xz
input: remove classic LIRC support
It's much easier to configure remotes as X11 input devices.
Diffstat (limited to 'input')
-rw-r--r--input/input.c13
-rw-r--r--input/input.h1
-rw-r--r--input/lirc.c167
3 files changed, 0 insertions, 181 deletions
diff --git a/input/input.c b/input/input.c
index 018a76fd43..b6719fc297 100644
--- a/input/input.c
+++ b/input/input.c
@@ -165,9 +165,6 @@ struct input_opts {
int ar_rate;
char *js_dev;
int use_joystick;
- int use_lirc;
- char *lirc_configfile;
- int use_lircc;
int use_alt_gr;
int use_appleremote;
int use_media_keys;
@@ -190,15 +187,11 @@ const struct m_sub_options input_config = {
OPT_FLAG("test", test, CONF_GLOBAL),
OPT_INTRANGE("doubleclick-time", doubleclick_time, 0, 0, 1000),
OPT_FLAG("joystick", use_joystick, CONF_GLOBAL),
- OPT_FLAG("lirc", use_lirc, CONF_GLOBAL),
OPT_FLAG("right-alt-gr", use_alt_gr, CONF_GLOBAL),
OPT_INTRANGE("key-fifo-size", key_fifo_size, CONF_GLOBAL, 2, 65000),
OPT_FLAG("cursor", enable_mouse_movements, CONF_GLOBAL),
OPT_FLAG("vo-keyboard", vo_key_input, CONF_GLOBAL),
OPT_FLAG("x11-keyboard", vo_key_input, CONF_GLOBAL), // old alias
-#if HAVE_LIRC
- OPT_STRING("lirc-conf", lirc_configfile, CONF_GLOBAL),
-#endif
#if HAVE_COCOA
OPT_FLAG("appleremote", use_appleremote, CONF_GLOBAL),
OPT_FLAG("media-keys", use_media_keys, CONF_GLOBAL),
@@ -212,7 +205,6 @@ const struct m_sub_options input_config = {
.doubleclick_time = 300,
.ar_delay = 200,
.ar_rate = 40,
- .use_lirc = 1,
.use_alt_gr = 1,
.enable_mouse_movements = 1,
#if HAVE_COCOA
@@ -1257,11 +1249,6 @@ void mp_input_load(struct input_ctx *ictx)
mp_input_joystick_add(ictx, input_conf->js_dev);
#endif
-#if HAVE_LIRC
- if (input_conf->use_lirc)
- mp_input_lirc_add(ictx, input_conf->lirc_configfile);
-#endif
-
if (input_conf->use_alt_gr) {
ictx->using_alt_gr = true;
}
diff --git a/input/input.h b/input/input.h
index 33d458ad5f..b684903ef5 100644
--- a/input/input.h
+++ b/input/input.h
@@ -258,7 +258,6 @@ void mp_input_set_repeat_info(struct input_ctx *ictx, int rate, int delay);
void mp_input_pipe_add(struct input_ctx *ictx, const char *filename);
void mp_input_joystick_add(struct input_ctx *ictx, char *dev);
-void mp_input_lirc_add(struct input_ctx *ictx, char *lirc_configfile);
struct mp_ipc_ctx;
struct mp_client_api;
diff --git a/input/lirc.c b/input/lirc.c
deleted file mode 100644
index db8d4f8e79..0000000000
--- a/input/lirc.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * This file is part of MPlayer.
- *
- * MPlayer 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.
- *
- * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <lirc/lirc_client.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <poll.h>
-
-#include "common/common.h"
-#include "common/msg.h"
-#include "input.h"
-
-struct ctx {
- struct mp_log *log;
- struct lirc_config *lirc_config;
- char* cmd_buf;
- int fd;
-};
-
-static struct ctx *mp_input_lirc_init(struct input_ctx *ictx, struct mp_log *log,
- char *lirc_configfile)
-{
- int lirc_sock;
- int mode;
-
- 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 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", mp_strerror(errno));
- lirc_deinit();
- return NULL;
- }
-
- struct lirc_config *lirc_config = NULL;
- if(lirc_readconfig( lirc_configfile,&lirc_config,NULL )!=0 ){
- mp_err(log, "Failed to read LIRC config file %s.\n",
- lirc_configfile == NULL ? "~/.lircrc" : lirc_configfile);
- lirc_deinit();
- return NULL;
- }
-
- struct ctx *ctx = talloc_ptrtype(NULL, ctx);
- *ctx = (struct ctx){
- .log = log,
- .lirc_config = lirc_config,
- .fd = lirc_sock,
- };
- return ctx;
-}
-
-static int mp_input_lirc_read(void *pctx,int fd,char* dest, int s) {
- int r,cl = 0;
- char *code = NULL,*c = NULL;
- struct ctx *ctx = pctx;
-
- // We have something in the buffer return it
- if(ctx->cmd_buf != NULL) {
- int l = strlen(ctx->cmd_buf), w = l > s ? s : l;
- memcpy(dest,ctx->cmd_buf,w);
- l -= w;
- if(l > 0)
- memmove(ctx->cmd_buf,&ctx->cmd_buf[w],l+1);
- else {
- free(ctx->cmd_buf);
- ctx->cmd_buf = NULL;
- }
- return w;
- }
-
- // Nothing in the buffer, poll the lirc fd
- if(lirc_nextcode(&code) != 0) {
- MP_ERR(ctx, "Lirc error.\n");
- return -1;
- }
-
- if(!code) return 0;
-
- // We put all cmds in a single buffer separated by \n
- while((r = lirc_code2char(ctx->lirc_config,code,&c))==0 && c!=NULL) {
- int l = strlen(c);
- if(l <= 0)
- continue;
- ctx->cmd_buf = realloc(ctx->cmd_buf,cl+l+2);
- memcpy(&ctx->cmd_buf[cl],c,l);
- cl += l+1;
- ctx->cmd_buf[cl-1] = '\n';
- ctx->cmd_buf[cl] = '\0';
- }
-
- free(code);
-
- if(r < 0)
- 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 0;
-
-}
-
-static int mp_input_lirc_close(void *pctx,int fd)
-{
- struct ctx *ctx = pctx;
- 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);
-}