From 1f5b12150575b6114e681a421f38acdd5171cff4 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 28 Nov 2015 00:44:34 +0100 Subject: [PATCH] Create input_get_bind_map_base --- input/input_common.c | 8 ++++++++ input/input_common.h | 2 ++ menu/menu_displaylist.c | 4 +--- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/input/input_common.c b/input/input_common.c index 914712b678..8f12a9d2cc 100644 --- a/input/input_common.c +++ b/input/input_common.c @@ -116,6 +116,14 @@ const struct input_bind_map input_config_bind_map[RARCH_BIND_LIST_END_NULL] = { #endif }; +const char *input_bind_map_get_base(const void *data) +{ + const struct input_bind_map* keybind = (const struct input_bind_map*)data; + if (!keybind) + return NULL; + return keybind->base; +} + /** * input_translate_coord_viewport: * @mouse_x : Pointer X coordinate. diff --git a/input/input_common.h b/input/input_common.h index 508420970a..e8cc812148 100644 --- a/input/input_common.h +++ b/input/input_common.h @@ -40,6 +40,8 @@ struct input_bind_map extern const struct input_bind_map input_config_bind_map[]; +const char *input_bind_map_get_base(const void *data); + /** * input_translate_coord_viewport: * @mouse_x : Pointer X coordinate. diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index a2b8d8aeff..043ae544fd 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -2623,10 +2623,8 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type) for (i = 0; i < RARCH_BIND_LIST_END; i++) { - const struct input_bind_map* keybind = (const struct input_bind_map*) - &input_config_bind_map[i]; ret = menu_displaylist_parse_settings(menu, info, - keybind->base, PARSE_ONLY_BIND, false); + input_bind_map_get_base(&input_config_bind_map[i]), PARSE_ONLY_BIND, false); (void)ret; } }