summaryrefslogtreecommitdiffstats
path: root/input
diff options
context:
space:
mode:
authorder richter <der.richter@gmx.de>2019-11-16 16:54:07 +0100
committerder richter <der.richter@gmx.de>2019-12-15 20:07:31 +0100
commit8a6ee7fe947bb01a49beb38152cedb1e1b206ed2 (patch)
tree6ccead9d45dcc1561601c6d4927c6c71ba528eac /input
parent1eb6cbd093481517e37b40aec174fc6f4e553bcd (diff)
downloadmpv-8a6ee7fe947bb01a49beb38152cedb1e1b206ed2.tar.bz2
mpv-8a6ee7fe947bb01a49beb38152cedb1e1b206ed2.tar.xz
mac: remove Apple Remote support
the Apple Remote has long been deprecated and abandoned by Apple. current macs don't come with support for it anymore. support might be re-added with the next commit.
Diffstat (limited to 'input')
-rw-r--r--input/input.c18
-rw-r--r--input/keycodes.c15
-rw-r--r--input/keycodes.h17
3 files changed, 3 insertions, 47 deletions
diff --git a/input/input.c b/input/input.c
index 084a61a2eb..1bc8e303f6 100644
--- a/input/input.c
+++ b/input/input.c
@@ -196,14 +196,14 @@ const struct m_sub_options input_config = {
OPT_FLAG("input-cursor", enable_mouse_movements, 0),
OPT_FLAG("input-vo-keyboard", vo_key_input, 0),
OPT_FLAG("input-media-keys", use_media_keys, 0),
-#if HAVE_COCOA
- OPT_FLAG("input-appleremote", use_appleremote, 0),
-#endif
#if HAVE_SDL2_GAMEPAD
OPT_FLAG("input-gamepad", use_gamepad, 0),
#endif
OPT_FLAG("window-dragging", allow_win_drag, 0),
OPT_REPLACED("input-x11-keyboard", "input-vo-keyboard"),
+#if HAVE_COCOA
+ OPT_REMOVED("input-appleremote", "replaced by MediaPlayer support"),
+#endif
{0}
},
.size = sizeof(struct input_opts),
@@ -215,9 +215,6 @@ const struct m_sub_options input_config = {
.use_alt_gr = 1,
.enable_mouse_movements = 1,
.use_media_keys = 1,
-#if HAVE_COCOA
- .use_appleremote = 1,
-#endif
.default_bindings = 1,
.vo_key_input = 1,
.allow_win_drag = 1,
@@ -1335,15 +1332,6 @@ static void reload_opts(struct input_ctx *ictx, bool shutdown)
#if HAVE_COCOA
struct input_opts *opts = ictx->opts;
- if (ictx->using_ar != (opts->use_appleremote && !shutdown)) {
- ictx->using_ar = !ictx->using_ar;
- if (ictx->using_ar) {
- cocoa_init_apple_remote();
- } else {
- cocoa_uninit_apple_remote();
- }
- }
-
if (ictx->using_cocoa_media_keys != (opts->use_media_keys && !shutdown)) {
ictx->using_cocoa_media_keys = !ictx->using_cocoa_media_keys;
if (ictx->using_cocoa_media_keys) {
diff --git a/input/keycodes.c b/input/keycodes.c
index 3d7fd09d11..bcf59c74a1 100644
--- a/input/keycodes.c
+++ b/input/keycodes.c
@@ -102,21 +102,6 @@ static const struct key_name key_names[] = {
{ MP_MBTN_MID_DBL, "MBTN_MID_DBL" },
{ MP_MBTN_RIGHT_DBL, "MBTN_RIGHT_DBL" },
- { MP_AR_PLAY, "AR_PLAY" },
- { MP_AR_PLAY_HOLD, "AR_PLAY_HOLD" },
- { MP_AR_CENTER, "AR_CENTER" },
- { MP_AR_CENTER_HOLD, "AR_CENTER_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_VUP_HOLD, "AR_VUP_HOLD" },
- { MP_AR_VDOWN, "AR_VDOWN" },
- { MP_AR_VDOWN_HOLD, "AR_VDOWN_HOLD" },
-
{ MP_KEY_GAMEPAD_ACTION_DOWN, "GAMEPAD_ACTION_DOWN" },
{ MP_KEY_GAMEPAD_ACTION_RIGHT, "GAMEPAD_ACTION_RIGHT" },
{ MP_KEY_GAMEPAD_ACTION_LEFT, "GAMEPAD_ACTION_LEFT" },
diff --git a/input/keycodes.h b/input/keycodes.h
index 65c31b4d61..a75099f2f2 100644
--- a/input/keycodes.h
+++ b/input/keycodes.h
@@ -141,23 +141,6 @@
#define MP_KEY_MOUSE_BTN_COUNT (MP_MBTN_END - MP_MBTN_BASE)
-// 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_CENTER (MP_AR_BASE + 2)
-#define MP_AR_CENTER_HOLD (MP_AR_BASE + 3)
-#define MP_AR_NEXT (MP_AR_BASE + 4)
-#define MP_AR_NEXT_HOLD (MP_AR_BASE + 5)
-#define MP_AR_PREV (MP_AR_BASE + 6)
-#define MP_AR_PREV_HOLD (MP_AR_BASE + 7)
-#define MP_AR_MENU (MP_AR_BASE + 8)
-#define MP_AR_MENU_HOLD (MP_AR_BASE + 9)
-#define MP_AR_VUP (MP_AR_BASE + 10)
-#define MP_AR_VUP_HOLD (MP_AR_BASE + 11)
-#define MP_AR_VDOWN (MP_AR_BASE + 12)
-#define MP_AR_VDOWN_HOLD (MP_AR_BASE + 13)
-
/* game controller keys */
#define MP_KEY_GAMEPAD (MP_KEY_BASE+0xF0)
#define MP_KEY_GAMEPAD_ACTION_DOWN (MP_KEY_GAMEPAD+0)