diff --git a/menu/menu_setting.c b/menu/menu_setting.c index f90ef0cfd8..cee2ed0c52 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -350,7 +350,7 @@ static void setting_get_string_representation_uint_libretro_device(void *data, if (!setting) return; - index_offset = setting_get_index_offset(setting); + index_offset = setting->index_offset; if (runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system) && system) @@ -403,7 +403,7 @@ static void setting_get_string_representation_uint_analog_dpad_mode(void *data, if (setting) { - unsigned index_offset = setting_get_index_offset(setting); + unsigned index_offset = setting->index_offset; strlcpy(s, modes[settings->input.analog_dpad_mode [index_offset] % ANALOG_DPAD_LAST], len); } @@ -838,7 +838,7 @@ static int setting_action_start_bind_device(void *data) if (!setting || !settings) return -1; - index_offset = setting_get_index_offset(setting); + index_offset = setting->index_offset; settings->input.joypad_map[index_offset] = index_offset; return 0; @@ -924,8 +924,8 @@ static int setting_action_start_libretro_device_type(void *data) if (setting_generic_action_start_default(setting) != 0) return -1; - index_offset = setting_get_index_offset(setting); - port = index_offset; + index_offset = setting->index_offset; + port = index_offset; devices[types++] = RETRO_DEVICE_NONE; devices[types++] = RETRO_DEVICE_JOYPAD; @@ -1159,7 +1159,7 @@ static int setting_action_left_bind_device(void *data, bool wraparound) if (!setting) return -1; - index_offset = setting_get_index_offset(setting); + index_offset = setting->index_offset; p = &settings->input.joypad_map[index_offset]; @@ -1181,7 +1181,7 @@ static int setting_action_right_bind_device(void *data, bool wraparound) if (!setting) return -1; - index_offset = setting_get_index_offset(setting); + index_offset = setting->index_offset; p = &settings->input.joypad_map[index_offset]; @@ -1216,7 +1216,7 @@ static int setting_action_ok_bind_all_save_autoconfig(void *data, bool wraparoun if (!settings || !setting) return -1; - index_offset = setting_get_index_offset(setting); + index_offset = setting->index_offset; if(config_save_autoconf_profile( settings->input.device_names[index_offset], index_offset)) @@ -1322,7 +1322,7 @@ static void get_string_representation_bind_device(void * data, char *s, if (!setting) return; - index_offset = setting_get_index_offset(setting); + index_offset = setting->index_offset; map = settings->input.joypad_map[index_offset]; if (map < settings->input.max_users) diff --git a/menu/widgets/menu_entry.c b/menu/widgets/menu_entry.c index cecb2c120f..7b38539957 100644 --- a/menu/widgets/menu_entry.c +++ b/menu/widgets/menu_entry.c @@ -231,10 +231,9 @@ void menu_entry_enum_set_value_with_string(uint32_t i, const char *s) int32_t menu_entry_bind_index(uint32_t i) { rarch_setting_t *setting = menu_entries_get_setting(i); - uint32_t index = setting_get_index(setting); - if (index) - return index - 1; + if (setting) + return setting->index - 1; return 0; } diff --git a/menu/widgets/menu_input_bind_dialog.c b/menu/widgets/menu_input_bind_dialog.c index 109c2cccb9..cc534f87db 100644 --- a/menu/widgets/menu_input_bind_dialog.c +++ b/menu/widgets/menu_input_bind_dialog.c @@ -86,7 +86,7 @@ static int menu_input_key_bind_set_mode_common( menu_displaylist_info_t info = {0}; struct retro_keybind *keybind = NULL; settings_t *settings = config_get_ptr(); - unsigned index_offset = setting_get_index_offset(setting); + unsigned index_offset = setting->index_offset; file_list_t *menu_stack = menu_entries_get_menu_stack_ptr(0); menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection); @@ -243,7 +243,7 @@ bool menu_input_key_bind_set_mode( if (menu_input_key_bind_set_mode_common(state, setting) == -1) return false; - index_offset = setting_get_index_offset(setting); + index_offset = setting->index_offset; menu_bind_port = settings->input.joypad_map[index_offset]; menu_input_key_bind_poll_bind_get_rested_axes( diff --git a/setting_list.c b/setting_list.c index e79cad8595..1c0c076d9f 100644 --- a/setting_list.c +++ b/setting_list.c @@ -101,20 +101,6 @@ bool settings_list_append(rarch_setting_t **list, return true; } -uint32_t setting_get_index(rarch_setting_t *setting) -{ - if (!setting) - return 0; - return setting->index; -} - -unsigned setting_get_index_offset(rarch_setting_t *setting) -{ - if (!setting) - return 0; - return setting->index_offset; -} - unsigned setting_get_bind_type(rarch_setting_t *setting) { if (!setting) @@ -612,7 +598,7 @@ static void setting_get_string_representation_st_bind(void *data, if (!setting) return; - index_offset = setting_get_index_offset(setting); + index_offset = setting->index_offset; keybind = (const struct retro_keybind*)setting->value.target.keybind; auto_bind = (const struct retro_keybind*) input_get_auto_bind(index_offset, keybind->id); diff --git a/setting_list.h b/setting_list.h index 34649c9423..a47a93a738 100644 --- a/setting_list.h +++ b/setting_list.h @@ -337,10 +337,6 @@ bool CONFIG_BIND( int setting_set_with_string_representation( rarch_setting_t* setting, const char *value); -unsigned setting_get_index_offset(rarch_setting_t *setting); - -uint32_t setting_get_index(rarch_setting_t *setting); - unsigned setting_get_bind_type(rarch_setting_t *setting); int setting_string_action_start_generic(void *data);