RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove some apple remote leftovers 

The options and key names don't do anything anymore.
This commit is contained in:
wm4 2013-04-05 10:54:07 +02:00
parent cae508dfb6
commit 4e55a6e828
5 changed files with 0 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DOCS/man/en/options.rst
View File

@ -911,10 +911,6 @@
Specify input configuration file other than the default
``~/.mpv/input.conf``.
--input-ar-dev=<device>
Device to be used for Apple IR Remote (default is autodetected, Linux
only).
--input-ar-delay
Delay in milliseconds before we start to autorepeat a key (0 to
disable).

12
core/input/input.c
View File

@ -386,17 +386,6 @@ static const struct key_name key_names[] = {
{ MP_JOY_BTN8, "JOY_BTN8" },
{ MP_JOY_BTN9, "JOY_BTN9" },
{ MP_AR_PLAY, "AR_PLAY" },
{ MP_AR_PLAY_HOLD, "AR_PLAY_HOLD" },
{ MP_AR_NEXT, "AR_NEXT" },
{ MP_AR_NEXT_HOLD, "AR_NEXT_HOLD" },
{ MP_AR_PREV, "AR_PREV" },
{ MP_AR_PREV_HOLD, "AR_PREV_HOLD" },
{ MP_AR_MENU, "AR_MENU" },
{ MP_AR_MENU_HOLD, "AR_MENU_HOLD" },
{ MP_AR_VUP, "AR_VUP" },
{ MP_AR_VDOWN, "AR_VDOWN" },
{ MP_KEY_POWER, "POWER" },
{ MP_KEY_MENU, "MENU" },
{ MP_KEY_PLAY, "PLAY" },
@ -526,7 +515,6 @@ static const m_option_t input_conf[] = {
{ "keylist", print_key_list, CONF_TYPE_PRINT_FUNC, CONF_GLOBAL | CONF_NOCFG },
{ "cmdlist", print_cmd_list, CONF_TYPE_PRINT_FUNC, CONF_GLOBAL | CONF_NOCFG },
OPT_STRING("js-dev", input.js_dev, CONF_GLOBAL),
OPT_STRING("ar-dev", input.ar_dev, CONF_GLOBAL),
OPT_STRING("file", input.in_file, CONF_GLOBAL),
OPT_FLAG("default-bindings", input.default_bindings, CONF_GLOBAL),
OPT_FLAG("test", input.test, CONF_GLOBAL),

13
core/input/keycodes.h
View File

@ -172,19 +172,6 @@
#define MP_MOUSE_BTN19_DBL (MP_MOUSE_BASE_DBL+19)
#define MP_MOUSE_BTN_DBL_END (MP_MOUSE_BASE_DBL+20)
// Apple Remote input module
#define MP_AR_BASE (MP_KEY_BASE+0xE0)
#define MP_AR_PLAY (MP_AR_BASE + 0)
#define MP_AR_PLAY_HOLD (MP_AR_BASE + 1)
#define MP_AR_NEXT (MP_AR_BASE + 2)
#define MP_AR_NEXT_HOLD (MP_AR_BASE + 3)
#define MP_AR_PREV (MP_AR_BASE + 4)
#define MP_AR_PREV_HOLD (MP_AR_BASE + 5)
#define MP_AR_MENU (MP_AR_BASE + 6)
#define MP_AR_MENU_HOLD (MP_AR_BASE + 7)
#define MP_AR_VUP (MP_AR_BASE + 8)
#define MP_AR_VDOWN (MP_AR_BASE + 9)
/* Special keys */
#define MP_KEY_INTERN (MP_KEY_BASE+0x1000)
#define MP_KEY_CLOSE_WIN (MP_KEY_INTERN+0)

1
core/options.h
View File

@ -216,7 +216,6 @@ typedef struct MPOpts {
int ar_delay;
int ar_rate;
char *js_dev;
char *ar_dev;
char *in_file;
int use_joystick;
int use_lirc;

15
etc/input.conf
View File

@ -134,21 +134,6 @@ k tv_step_channel -1
n tv_step_norm
u tv_step_chanlist
#
# Apple Remote section
#
AR_PLAY cycle pause
AR_PLAY_HOLD quit
AR_NEXT seek 30
AR_NEXT_HOLD seek 120
AR_PREV seek -10
AR_PREV_HOLD seek -120
AR_MENU cycle osd
AR_MENU_HOLD cycle mute
AR_VUP add volume 1
AR_VDOWN add volume -1
#
# Joystick section
# WARNING: joystick support has to be explicitly enabled at