mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Menu) Refactor menu_setting_toggle

Browse Source
This commit is contained in:
twinaphex 2014-09-01 18:00:28 +02:00
parent 903004113a
commit 7160a6d9f5
1 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1319,22 +1319,67 @@ static int menu_common_setting_set(unsigned id, unsigned action)
#endif #endif
static int menu_common_setting_toggle(unsigned id, unsigned action) static int menu_setting_toggle(unsigned type,
const char *dir, const char *label,
unsigned action)
{ {
if ((id >= MENU_SETTINGS_SHADER_FILTER) && if ((
(id <= MENU_SETTINGS_SHADER_LAST)) !strcmp(label, "load_content") ||
!strcmp(label, "detect_core_list"))
&& action == MENU_ACTION_OK)
{
driver.menu->defer_core = (!strcmp(label, "detect_core_list"));
menu_entries_push(driver.menu->menu_stack,
g_settings.menu_content_directory, "", MENU_FILE_DIRECTORY,
driver.menu->selection_ptr);
}
else if ((!strcmp(label, "history_list") ||
menu_common_type_is(type) == MENU_FILE_DIRECTORY)
&& action == MENU_ACTION_OK)
menu_entries_push(driver.menu->menu_stack,
"", "", type, driver.menu->selection_ptr);
else if ((
menu_common_type_is(type) == MENU_SETTINGS ||
type == MENU_SETTINGS_CORE ||
type == MENU_SETTINGS_CONFIG ||
type == MENU_SETTINGS_DISK_APPEND) &&
action == MENU_ACTION_OK
)
menu_entries_push(driver.menu->menu_stack,
dir ? dir : label, "", type,
driver.menu->selection_ptr);
else if (type == MENU_SETTINGS_CUSTOM_VIEWPORT &&
action == MENU_ACTION_OK)
{
file_list_push(driver.menu->menu_stack, "", "",
type, driver.menu->selection_ptr);
// Start with something sane.
rarch_viewport_t *custom = (rarch_viewport_t*)
&g_extern.console.screen.viewports.custom_vp;
if (driver.video_data && driver.video &&
driver.video->viewport_info)
driver.video->viewport_info(driver.video_data, custom);
aspectratio_lut[ASPECT_RATIO_CUSTOM].value =
(float)custom->width / custom->height;
g_settings.video.aspect_ratio_idx = ASPECT_RATIO_CUSTOM;
rarch_main_command(RARCH_CMD_VIDEO_SET_ASPECT_RATIO);
}
else if ((type >= MENU_SETTINGS_SHADER_FILTER) &&
(type <= MENU_SETTINGS_SHADER_LAST))
{ {
if (driver.menu_ctx && driver.menu_ctx->backend if (driver.menu_ctx && driver.menu_ctx->backend
&& driver.menu_ctx->backend->shader_manager_setting_toggle) && driver.menu_ctx->backend->shader_manager_setting_toggle)
return driver.menu_ctx->backend->shader_manager_setting_toggle( return driver.menu_ctx->backend->shader_manager_setting_toggle(
id, action); type, action);
return 0;
} }
if ((id >= MENU_SETTINGS_CORE_OPTION_START)) else if ((type >= MENU_SETTINGS_CORE_OPTION_START))
return menu_common_core_setting_toggle(id, action); return menu_common_core_setting_toggle(type, action);
else if (driver.menu_ctx && driver.menu_ctx->backend)
if (driver.menu_ctx && driver.menu_ctx->backend) return menu_common_setting_set(type, action);
return menu_common_setting_set(id, action);
return 0; return 0;
} }
@ -1400,54 +1445,9 @@ static int menu_settings_iterate(unsigned action)
case MENU_ACTION_RIGHT: case MENU_ACTION_RIGHT:
case MENU_ACTION_OK: case MENU_ACTION_OK:
case MENU_ACTION_START: case MENU_ACTION_START:
if ((
!strcmp(label, "load_content") ||
!strcmp(label, "detect_core_list"))
&& action == MENU_ACTION_OK)
{ {
driver.menu->defer_core = (!strcmp(label, "detect_core_list")); int ret = menu_setting_toggle(type, dir,
menu_entries_push(driver.menu->menu_stack, label, action);
g_settings.menu_content_directory, "", MENU_FILE_DIRECTORY,
driver.menu->selection_ptr);
}
else if ((!strcmp(label, "history_list") ||
menu_common_type_is(type) == MENU_FILE_DIRECTORY)
&& action == MENU_ACTION_OK)
menu_entries_push(driver.menu->menu_stack,
"", "", type, driver.menu->selection_ptr);
else if ((
menu_common_type_is(type) == MENU_SETTINGS ||
type == MENU_SETTINGS_CORE ||
type == MENU_SETTINGS_CONFIG ||
type == MENU_SETTINGS_DISK_APPEND) &&
action == MENU_ACTION_OK
)
menu_entries_push(driver.menu->menu_stack,
dir ? dir : label, "", type,
driver.menu->selection_ptr);
else if (type == MENU_SETTINGS_CUSTOM_VIEWPORT &&
action == MENU_ACTION_OK)
{
file_list_push(driver.menu->menu_stack, "", "",
type, driver.menu->selection_ptr);
// Start with something sane.
rarch_viewport_t *custom = (rarch_viewport_t*)
&g_extern.console.screen.viewports.custom_vp;
if (driver.video_data && driver.video &&
driver.video->viewport_info)
driver.video->viewport_info(driver.video_data, custom);
aspectratio_lut[ASPECT_RATIO_CUSTOM].value =
(float)custom->width / custom->height;
g_settings.video.aspect_ratio_idx = ASPECT_RATIO_CUSTOM;
rarch_main_command(RARCH_CMD_VIDEO_SET_ASPECT_RATIO);
}
else
{
int ret = menu_common_setting_toggle(type, action);
if (ret) if (ret)
return ret; return ret;