diff options
| -rw-r--r-- | DOCS/man/en/options.rst | 4 | ||||
| -rw-r--r-- | core/input/input.c | 12 | ||||
| -rw-r--r-- | core/input/keycodes.h | 13 | ||||
| -rw-r--r-- | core/options.h | 1 | ||||
| -rw-r--r-- | etc/input.conf | 15 |
5 files changed, 0 insertions, 45 deletions
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index 5faf3cdb7e..b99c2428fb 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -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). diff --git a/core/input/input.c b/core/input/input.c index 4873b8275a..1790834a53 100644 --- a/core/input/input.c +++ b/core/input/input.c @@ -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), diff --git a/core/input/keycodes.h b/core/input/keycodes.h index 18ce7ce1cc..14f7b9ee85 100644 --- a/core/input/keycodes.h +++ b/core/input/keycodes.h @@ -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) diff --git a/core/options.h b/core/options.h index 716ad5c357..c92420bf92 100644 --- a/core/options.h +++ b/core/options.h @@ -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; diff --git a/etc/input.conf b/etc/input.conf index db378ff12f..8623a239d9 100644 --- a/etc/input.conf +++ b/etc/input.conf @@ -135,21 +135,6 @@ 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 # compiletime with --enable-joystick |