mirror of
https://github.com/mpv-player/mpv
synced 2024-11-03 03:19:24 +01:00
input: remove LIRCCD support
This removes support for the "LIRC Client Daemon", which is separate from LIRC, and hasn't been maintained for 10 years. See github issue #413.
This commit is contained in:
parent
9662e3e509
commit
3e6cd3ef19
@ -58,10 +58,6 @@
|
||||
#include "lirc.h"
|
||||
#endif
|
||||
|
||||
#if HAVE_LIRCC
|
||||
#include <lirc/lircc.h>
|
||||
#endif
|
||||
|
||||
#if HAVE_COCOA
|
||||
#include "osdep/macosx_events.h"
|
||||
#endif
|
||||
@ -638,7 +634,6 @@ const m_option_t mp_input_opts[] = {
|
||||
OPT_INTRANGE("doubleclick-time", input.doubleclick_time, 0, 0, 1000),
|
||||
OPT_FLAG("joystick", input.use_joystick, CONF_GLOBAL),
|
||||
OPT_FLAG("lirc", input.use_lirc, CONF_GLOBAL),
|
||||
OPT_FLAG("lircc", input.use_lircc, CONF_GLOBAL),
|
||||
OPT_FLAG("right-alt-gr", input.use_alt_gr, CONF_GLOBAL),
|
||||
#if HAVE_COCOA
|
||||
OPT_FLAG("ar", input.use_ar, CONF_GLOBAL),
|
||||
@ -2409,14 +2404,6 @@ struct input_ctx *mp_input_init(struct mpv_global *global)
|
||||
}
|
||||
#endif
|
||||
|
||||
#if HAVE_LIRCC
|
||||
if (input_conf->use_lircc) {
|
||||
int fd = lircc_init("mpv", NULL);
|
||||
if (fd >= 0)
|
||||
mp_input_add_cmd_fd(ictx, fd, 1, NULL, lircc_cleanup);
|
||||
}
|
||||
#endif
|
||||
|
||||
if (input_conf->use_alt_gr) {
|
||||
ictx->using_alt_gr = true;
|
||||
}
|
||||
|
@ -874,7 +874,6 @@ const struct MPOpts mp_default_opts = {
|
||||
.ar_rate = 40,
|
||||
.use_joystick = 1,
|
||||
.use_lirc = 1,
|
||||
.use_lircc = 1,
|
||||
.use_alt_gr = 1,
|
||||
#if HAVE_COCOA
|
||||
.use_ar = 1,
|
||||
|
@ -301,7 +301,6 @@ Optional features:
|
||||
--enable-termios use termios database for key codes [autodetect]
|
||||
--disable-iconv disable iconv for encoding conversion [autodetect]
|
||||
--enable-lirc enable LIRC (remote control) support [autodetect]
|
||||
--enable-lircc enable LIRCCD (LIRC client daemon) input [autodetect]
|
||||
--enable-joystick enable joystick support [disable]
|
||||
--disable-vm disable X video mode extensions [autodetect]
|
||||
--disable-xf86keysym disable support for multimedia keys [autodetect]
|
||||
@ -473,7 +472,6 @@ _libquvi9=auto
|
||||
_libguess=auto
|
||||
_joystick=no
|
||||
_lirc=auto
|
||||
_lircc=auto
|
||||
_terminfo=auto
|
||||
_termcap=auto
|
||||
_termios=auto
|
||||
@ -686,8 +684,6 @@ for ac_option do
|
||||
--lua=*) lua_pkg=$(echo $ac_option | cut -d '=' -f 2) ;;
|
||||
--enable-lirc) _lirc=yes ;;
|
||||
--disable-lirc) _lirc=no ;;
|
||||
--enable-lircc) _lircc=yes ;;
|
||||
--disable-lircc) _lircc=no ;;
|
||||
--enable-terminfo) _terminfo=yes ;;
|
||||
--disable-terminfo) _terminfo=no ;;
|
||||
--enable-termcap) _termcap=yes ;;
|
||||
@ -3173,19 +3169,6 @@ else
|
||||
fi
|
||||
echores "$_lirc"
|
||||
|
||||
echocheck "lircc"
|
||||
if test "$_lircc" = auto ; then
|
||||
_lircc=no
|
||||
header_check lirc/lircc.h -llircc && _lircc=yes
|
||||
fi
|
||||
if test "$_lircc" = yes ; then
|
||||
def_lircc='#define HAVE_LIRCC 1'
|
||||
libs_mplayer="$libs_mplayer -llircc"
|
||||
else
|
||||
def_lircc='#define HAVE_LIRCC 0'
|
||||
fi
|
||||
echores "$_lircc"
|
||||
|
||||
#############################################################################
|
||||
|
||||
if mingw32 ; then
|
||||
@ -3457,7 +3440,6 @@ $def_libbs2b
|
||||
/* input */
|
||||
$def_joystick
|
||||
$def_lirc
|
||||
$def_lircc
|
||||
$def_pvr
|
||||
$def_radio
|
||||
$def_radio_capture
|
||||
|
4
wscript
4
wscript
@ -229,10 +229,6 @@ If you really mean to compile without libass support use --disable-libass."
|
||||
'name' : '--lirc',
|
||||
'desc' : 'lirc',
|
||||
'func': check_cc(header_name='lirc/lirc_client.h', lib='lirc_client'),
|
||||
}, {
|
||||
'name' : '--lircc',
|
||||
'desc' : 'lircc',
|
||||
'func': check_cc(header_name='lirc/lircc.h', lib='lircc'),
|
||||
}, {
|
||||
'name' : '--vcd',
|
||||
'desc' : 'VCD support',
|
||||
|
Loading…
Reference in New Issue
Block a user