libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-03-05 16:37:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(Menu) Simplify some code

Browse Source
This commit is contained in:
twinaphex 2014-08-27 15:08:21 +02:00
parent d193973c4f
commit 8259100d03
2 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
frontend/menu/backend/menu_common_backend.c
View File

@ -44,15 +44,12 @@
static inline struct gfx_shader *shader_manager_get_current_shader(menu_handle_t *menu, unsigned type)
{
struct gfx_shader *shader = NULL;
if (type == MENU_SETTINGS_SHADER_PRESET_PARAMETERS)
shader = menu->shader;
return menu->shader;
else if (driver.video_poke && driver.video_data && driver.video_poke->get_current_shader)
return driver.video_poke->get_current_shader(driver.video_data);
if (!shader && driver.video_poke && driver.video_data && driver.video_poke->get_current_shader)
shader = driver.video_poke->get_current_shader(driver.video_data);
return shader;
return NULL;
}
static void menu_common_entries_init(menu_handle_t *menu, unsigned menu_type)
@ -998,6 +995,7 @@ static int menu_info_screen_iterate(unsigned action, rarch_setting_t *setting)
if (action == MENU_ACTION_OK)
file_list_pop(driver.menu->menu_stack, &driver.menu->selection_ptr);
return 0;
}
@ -1062,15 +1060,13 @@ static int menu_start_screen_iterate(unsigned action)
if (action == MENU_ACTION_OK)
file_list_pop(driver.menu->menu_stack, &driver.menu->selection_ptr);
return 0;
}
static unsigned menu_common_type_is(unsigned type)
{
unsigned ret = 0;
bool type_found;
type_found =
bool type_found =
type == MENU_SETTINGS ||
type == MENU_SETTINGS_GENERAL_OPTIONS ||
type == MENU_SETTINGS_CORE_OPTIONS ||
@ -1095,21 +1091,16 @@ static unsigned menu_common_type_is(unsigned type)
(type == MENU_SETTINGS_INPUT_OPTIONS);
if (type_found)
{
ret = MENU_SETTINGS;
return ret;
}
return MENU_SETTINGS;
type_found = (type >= MENU_SETTINGS_SHADER_0 &&
type_found = (
type >= MENU_SETTINGS_SHADER_0 &&
type <= MENU_SETTINGS_SHADER_LAST &&
((type - MENU_SETTINGS_SHADER_0) % 3) == 0) ||
(((type - MENU_SETTINGS_SHADER_0) % 3) == 0)) ||
type == MENU_SETTINGS_SHADER_PRESET;
if (type_found)
{
ret = MENU_SETTINGS_SHADER_OPTIONS;
return ret;
}
return MENU_SETTINGS_SHADER_OPTIONS;
type_found =
type == MENU_BROWSER_DIR_PATH ||
@ -1130,9 +1121,9 @@ static unsigned menu_common_type_is(unsigned type)
type == MENU_SYSTEM_DIR_PATH;
if (type_found)
ret = MENU_FILE_DIRECTORY;
return MENU_FILE_DIRECTORY;
return ret;
return 0;
}
@ -1747,7 +1738,6 @@ static int menu_custom_bind_iterate(void *data, unsigned action)
menu_handle_t *menu = (menu_handle_t*)data;
(void)action; // Have to ignore action here. Only bind that should work here is Quit RetroArch or something like that.
(void)msg;
if (driver.video_data && driver.menu_ctx && driver.menu_ctx->render)
driver.menu_ctx->render();
@ -1784,7 +1774,6 @@ static int menu_custom_bind_iterate_keyboard(void *data, unsigned action)
menu_handle_t *menu = (menu_handle_t*)data;
(void)action; // Have to ignore action here.
(void)msg;
if (driver.video_data && driver.menu_ctx && driver.menu_ctx->render)
driver.menu_ctx->render();
@ -1983,6 +1972,7 @@ static void menu_common_setting_set_current_unsigned_integer(rarch_setting_t *se
break;
}
}
if (setting->change_handler)
setting->change_handler(setting);
}

2
frontend/menu/menu_input_line_cb.c
View File

@ -152,7 +152,7 @@ void menu_poll_bind_state(struct menu_bind_state *state)
return;
}
if (joypad)
if (joypad->poll)
joypad->poll();
for (i = 0; i < MAX_PLAYERS; i++)