From 17f616e3dc6283d32008630851d95457e2e19ea3 Mon Sep 17 00:00:00 2001 From: radius Date: Mon, 15 Feb 2016 22:07:50 -0500 Subject: [PATCH] use descriptors in core input remapping --- menu/cbs/menu_cbs_get_value.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c index 50fd56410d..aa1eeafbaf 100644 --- a/menu/cbs/menu_cbs_get_value.c +++ b/menu/cbs/menu_cbs_get_value.c @@ -390,15 +390,37 @@ static void menu_action_setting_disp_set_label_input_desc( remap_id = settings->input.remap_ids [inp_desc_user][inp_desc_button_index_offset]; + const struct retro_keybind *keybind = + (const struct retro_keybind*) + &settings->input.binds[inp_desc_user][remap_id]; + const struct retro_keybind *auto_bind = + (const struct retro_keybind*) + input_get_auto_bind(inp_desc_user, remap_id); + + char descriptor[PATH_MAX_LENGTH]; + input_config_get_bind_string(descriptor, + keybind, auto_bind, sizeof(descriptor)); + if (inp_desc_button_index_offset < RARCH_FIRST_CUSTOM_BIND) - strlcpy(s, + { + if(strstr(descriptor,"Auto")) + strlcpy(s, + descriptor, + len); + else + strlcpy(s, settings->input.binds[inp_desc_user][remap_id].desc, len); + } + + + else strlcpy(s, axis_labels[remap_id], len); *w = 19; strlcpy(s2, path, len2); + } static void menu_action_setting_disp_set_label_cheat(