diff options
Diffstat (limited to 'input')
| -rw-r--r-- | input/cmd.h | 3 | ||||
| -rw-r--r-- | input/input.c | 35 |
2 files changed, 18 insertions, 20 deletions
diff --git a/input/cmd.h b/input/cmd.h index c22672b9d3..3ed07e8028 100644 --- a/input/cmd.h +++ b/input/cmd.h @@ -152,7 +152,4 @@ struct mp_cmd *mp_cmd_clone(struct mp_cmd *cmd); extern const struct m_option_type m_option_type_cycle_dir; -#define OPT_CYCLEDIR(...) \ - OPT_GENERAL(double, __VA_ARGS__, .type = &m_option_type_cycle_dir) - #endif diff --git a/input/input.c b/input/input.c index f9475648b0..5a606fd189 100644 --- a/input/input.c +++ b/input/input.c @@ -183,26 +183,27 @@ struct input_opts { const struct m_sub_options input_config = { .opts = (const m_option_t[]) { - OPT_STRING("input-conf", config_file, M_OPT_FILE), - OPT_INT("input-ar-delay", ar_delay, 0), - OPT_INT("input-ar-rate", ar_rate, 0), - OPT_PRINT("input-keylist", mp_print_key_list), - OPT_PRINT("input-cmdlist", mp_print_cmd_list), - OPT_FLAG("input-default-bindings", default_bindings, 0), - OPT_FLAG("input-test", test, 0), - OPT_INTRANGE("input-doubleclick-time", doubleclick_time, 0, 0, 1000), - OPT_FLAG("input-right-alt-gr", use_alt_gr, 0), - 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), + {"input-conf", OPT_STRING(config_file), .flags = M_OPT_FILE}, + {"input-ar-delay", OPT_INT(ar_delay)}, + {"input-ar-rate", OPT_INT(ar_rate)}, + {"input-keylist", OPT_PRINT(mp_print_key_list)}, + {"input-cmdlist", OPT_PRINT(mp_print_cmd_list)}, + {"input-default-bindings", OPT_FLAG(default_bindings)}, + {"input-test", OPT_FLAG(test)}, + {"input-doubleclick-time", OPT_INT(doubleclick_time), + M_RANGE(0, 1000)}, + {"input-right-alt-gr", OPT_FLAG(use_alt_gr)}, + {"input-key-fifo-size", OPT_INT(key_fifo_size), M_RANGE(2, 65000)}, + {"input-cursor", OPT_FLAG(enable_mouse_movements)}, + {"input-vo-keyboard", OPT_FLAG(vo_key_input)}, + {"input-media-keys", OPT_FLAG(use_media_keys)}, #if HAVE_SDL2_GAMEPAD - OPT_FLAG("input-gamepad", use_gamepad, 0), + {"input-gamepad", OPT_FLAG(use_gamepad)}, #endif - OPT_FLAG("window-dragging", allow_win_drag, 0), - OPT_REPLACED("input-x11-keyboard", "input-vo-keyboard"), + {"window-dragging", OPT_FLAG(allow_win_drag)}, + {"input-x11-keyboard", OPT_REPLACED("input-vo-keyboard")}, #if HAVE_COCOA - OPT_REMOVED("input-appleremote", "replaced by MediaPlayer support"), + {"input-appleremote", OPT_REMOVED("replaced by MediaPlayer support")}, #endif {0} }, |