From 037c7a92792837642626a120a90fb4ef74f7547e Mon Sep 17 00:00:00 2001 From: James Ross-Gowan Date: Tue, 25 Jul 2017 23:51:40 +1000 Subject: w32_common: handle media keys This was attempted before in fc9695e63b5b, but it was reverted in 1b7ce759b1f4 because it caused conflicts with other software watching the same keys (See #2041.) It seems like some PCs ship with OEM software that watches the volume keys without consuming key events and this causes them to be handled twice, once by mpv and once by the other software. In order to prevent conflicts like this, use the WM_APPCOMMAND message to handle media keys. Returning TRUE from the WM_APPCOMMAND handler should indicate to the operating system that we consumed the key event and it should not be propogated to the shell. Also, we now only listen for keys that are directly related to multimedia playback (eg. the APPCOMMAND_MEDIA_* keys.) Keys like APPCOMMAND_VOLUME_* are ignored, so they can be handled by the shell, or by other mixer software. --- input/input.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'input/input.c') diff --git a/input/input.c b/input/input.c index 4a20ab1311..ed7c1ec160 100644 --- a/input/input.c +++ b/input/input.c @@ -200,9 +200,9 @@ const struct m_sub_options input_config = { OPT_INTRANGE("input-key-fifo-size", key_fifo_size, 0, 2, 65000), 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), - OPT_FLAG("input-media-keys", use_media_keys, 0), #endif OPT_FLAG("window-dragging", allow_win_drag, 0), OPT_REPLACED("input-x11-keyboard", "input-vo-keyboard"), @@ -216,9 +216,9 @@ const struct m_sub_options input_config = { .ar_rate = 40, .use_alt_gr = 1, .enable_mouse_movements = 1, + .use_media_keys = 1, #if HAVE_COCOA .use_appleremote = 1, - .use_media_keys = 1, #endif .default_bindings = 1, .vo_key_input = 1, @@ -1441,6 +1441,14 @@ bool mp_input_use_alt_gr(struct input_ctx *ictx) return r; } +bool mp_input_use_media_keys(struct input_ctx *ictx) +{ + input_lock(ictx); + bool r = ictx->opts->use_media_keys; + input_unlock(ictx); + return r; +} + struct mp_cmd *mp_input_parse_cmd(struct input_ctx *ictx, bstr str, const char *location) { -- cgit v1.2.3