From 134c3e148cbe2f21608e6d67431f23c3fcbbda8f Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Sun, 1 Sep 2013 20:36:57 +0200 Subject: osx: use MP_KEY_* instead of MK_* for media keys In 213ad5d6c I added `MK_*` key bindings overlooking the fact that mpv already has `MP_KEY_*` for media keys. --- mpvcore/input/input.c | 4 ---- mpvcore/input/keycodes.h | 6 ------ 2 files changed, 10 deletions(-) (limited to 'mpvcore') diff --git a/mpvcore/input/input.c b/mpvcore/input/input.c index f977fd9e9d..41df0af855 100644 --- a/mpvcore/input/input.c +++ b/mpvcore/input/input.c @@ -429,10 +429,6 @@ static const struct key_name key_names[] = { { MP_AR_VDOWN, "AR_VDOWN" }, { MP_AR_VDOWN_HOLD, "AR_VDOWN_HOLD" }, - { MP_MK_PLAY, "MK_PLAY" }, - { MP_MK_PREV, "MK_PREV" }, - { MP_MK_NEXT, "MK_NEXT" }, - { MP_AXIS_UP, "AXIS_UP" }, { MP_AXIS_DOWN, "AXIS_DOWN" }, { MP_AXIS_LEFT, "AXIS_LEFT" }, diff --git a/mpvcore/input/keycodes.h b/mpvcore/input/keycodes.h index ade5091695..23aa634b5e 100644 --- a/mpvcore/input/keycodes.h +++ b/mpvcore/input/keycodes.h @@ -201,12 +201,6 @@ #define MP_AR_VDOWN (MP_AR_BASE + 12) #define MP_AR_VDOWN_HOLD (MP_AR_BASE + 13) -// Apple Media Keys input module -#define MP_MK_BASE (MP_KEY_BASE+0xF0) -#define MP_MK_PLAY (MP_MK_BASE + 0) -#define MP_MK_PREV (MP_MK_BASE + 1) -#define MP_MK_NEXT (MP_MK_BASE + 2) - // Mouse wheels or touchpad input #define MP_AXIS_BASE (MP_KEY_BASE+0x100) #define MP_AXIS_UP (MP_AXIS_BASE+0) -- cgit v1.2.3