ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use menu_setting_find

This commit is contained in:
twinaphex 2015-05-08 17:19:43 +02:00
parent f7515ba40c
commit cb22a3feb9
4 changed files with 14 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
menu/menu_entries_cbs_iterate.c
View File

@ -222,15 +222,11 @@ static int action_iterate_info(const char *label, unsigned action)
menu_driver_render(); menu_driver_render();
current_setting = (rarch_setting_t*)setting_find_setting( current_setting = menu_setting_find(list->list[selection].label);
menu->list_settings,
list->list[selection].label);
if (current_setting) if (current_setting)
strlcpy(needle, current_setting->name, sizeof(needle)); strlcpy(needle, current_setting->name, sizeof(needle));
else if ((current_setting = (rarch_setting_t*)setting_find_setting( else if ((current_setting = menu_setting_find(list->list[selection].label)))
menu->list_settings,
list->list[selection].label)))
{ {
if (current_setting) if (current_setting)
strlcpy(needle, current_setting->name, sizeof(needle)); strlcpy(needle, current_setting->name, sizeof(needle));

29
menu/menu_input.c
View File

@ -89,9 +89,7 @@ void menu_input_st_uint_callback(void *userdata, const char *str)
if (str && *str) if (str && *str)
{ {
rarch_setting_t *current_setting = NULL; rarch_setting_t *current_setting = NULL;
if ((current_setting = (rarch_setting_t*) if ((current_setting = menu_setting_find(menu->keyboard.label_setting)))
setting_find_setting(
menu->list_settings, menu->keyboard.label_setting)))
*current_setting->value.unsigned_integer = strtoul(str, NULL, 0); *current_setting->value.unsigned_integer = strtoul(str, NULL, 0);
} }
@ -108,9 +106,7 @@ void menu_input_st_hex_callback(void *userdata, const char *str)
if (str && *str) if (str && *str)
{ {
rarch_setting_t *current_setting = NULL; rarch_setting_t *current_setting = NULL;
if ((current_setting = (rarch_setting_t*) if ((current_setting = menu_setting_find(menu->keyboard.label_setting)))
setting_find_setting(
menu->list_settings, menu->keyboard.label_setting)))
if (str[0] == '#') if (str[0] == '#')
str++; str++;
*current_setting->value.unsigned_integer = strtoul(str, NULL, 16); *current_setting->value.unsigned_integer = strtoul(str, NULL, 16);
@ -132,9 +128,7 @@ void menu_input_st_string_callback(void *userdata, const char *str)
rarch_setting_t *current_setting = NULL; rarch_setting_t *current_setting = NULL;
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
if ((current_setting = (rarch_setting_t*) if ((current_setting = menu_setting_find(menu->keyboard.label_setting)))
setting_find_setting(
menu->list_settings, menu->keyboard.label_setting)))
{ {
strlcpy(current_setting->value.string, str, current_setting->size); strlcpy(current_setting->value.string, str, current_setting->size);
menu_setting_generic(current_setting); menu_setting_generic(current_setting);
@ -739,10 +733,8 @@ static int menu_input_mouse_post_iterate(menu_file_list_cbs_t *cbs,
{ {
if (!menu->mouse.oldleft) if (!menu->mouse.oldleft)
{ {
rarch_setting_t *setting = rarch_setting_t *setting = menu_setting_find(
(rarch_setting_t*)setting_find_setting menu->menu_list->selection_buf->list[nav->selection_ptr].label);
(menu->list_settings,
menu->menu_list->selection_buf->list[nav->selection_ptr].label);
menu->mouse.oldleft = true; menu->mouse.oldleft = true;
#if 0 #if 0
@ -797,14 +789,13 @@ static int pointer_tap(menu_file_list_cbs_t *cbs, const char *path,
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
driver_t *driver = driver_get_ptr(); driver_t *driver = driver_get_ptr();
rarch_setting_t *setting = rarch_setting_t *setting =
(rarch_setting_t*)setting_find_setting menu_setting_find(
(driver->menu->list_settings, driver->menu->menu_list->selection_buf->list[menu->navigation.selection_ptr].label);
driver->menu->menu_list->selection_buf->list[menu->navigation.selection_ptr].label);
if (menu->pointer.ptr == menu->navigation.selection_ptr if (menu->pointer.ptr == menu->navigation.selection_ptr
&& cbs && cbs->action_toggle && setting && && cbs && cbs->action_toggle && setting &&
(setting->type == ST_BOOL || setting->type == ST_UINT (setting->type == ST_BOOL || setting->type == ST_UINT
|| setting->type == ST_FLOAT || setting->type == ST_STRING)) || setting->type == ST_FLOAT || setting->type == ST_STRING))
return cbs->action_toggle(type, label, MENU_ACTION_RIGHT, true); return cbs->action_toggle(type, label, MENU_ACTION_RIGHT, true);
else if (menu->pointer.ptr == menu->navigation.selection_ptr) else if (menu->pointer.ptr == menu->navigation.selection_ptr)
return cbs->action_ok(path, label, type, menu->navigation.selection_ptr); return cbs->action_ok(path, label, type, menu->navigation.selection_ptr);

3
menu/menu_setting.c
View File

@ -138,8 +138,7 @@ rarch_setting_t *menu_setting_find(const char *label)
if (!menu) if (!menu)
return NULL; return NULL;
return (rarch_setting_t*)setting_find_setting( return setting_find_setting(menu->list_settings, label);
menu->list_settings, label);
} }
int menu_setting_set(unsigned type, const char *label, int menu_setting_set(unsigned type, const char *label,

3
settings.c
View File

@ -2889,8 +2889,7 @@ void setting_get_label(file_list_t *list, char *type_str,
if (!setting_data) if (!setting_data)
return; return;
setting = (rarch_setting_t*)setting_find_setting(setting_data, setting = setting_find_setting(setting_data, list->list[idx].label);
list->list[idx].label);
if (setting) if (setting)
setting_get_string_representation(setting, type_str, type_str_size); setting_get_string_representation(setting, type_str, type_str_size);