CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-02-04 02:26:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor MENU_SETTINGS_OVERLAY_PRESET

Browse Source
This commit is contained in:
twinaphex 2014-08-02 15:16:56 +02:00
parent 04b39bbe22
commit 946fc6040e
2 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2196,6 +2196,22 @@ static void menu_common_setting_set_current_boolean(rarch_setting_t *setting, un
setting->change_handler(setting);
}
static void menu_common_setting_set_current_path_selection(rarch_setting_t *setting, const char *start_path, unsigned type, unsigned action)
{
switch (action)
{
case MENU_ACTION_OK:
menu_common_setting_push_current_menu(driver.menu->menu_stack, start_path, type, driver.menu->selection_ptr, action);
break;
case MENU_ACTION_START:
strlcpy(setting->value.string, setting->default_value.string, setting->size);
break;
}
if (setting->change_handler)
setting->change_handler(setting);
}
static void menu_common_setting_set_current_fraction(rarch_setting_t *setting, float step, unsigned action,
bool enforce_min_check, bool enforce_max_check)
{
@ -3698,18 +3714,8 @@ static int menu_common_setting_set(unsigned setting, unsigned action)
break;
#ifdef HAVE_OVERLAY
case MENU_SETTINGS_OVERLAY_PRESET:
switch (action)
{
case MENU_ACTION_OK:
menu_common_setting_push_current_menu(driver.menu->menu_stack, g_extern.overlay_dir, setting, driver.menu->selection_ptr, action);
break;
case MENU_ACTION_START:
rarch_main_command(RARCH_CMD_OVERLAY_DEINIT);
*g_settings.input.overlay = '\0';
break;
default:
break;
}
if ((current_setting = setting_data_find_setting(setting_data, "input_overlay")))
menu_common_setting_set_current_path_selection(current_setting, g_extern.overlay_dir, setting, action);
break;
#endif
case MENU_CONTENT_HISTORY_PATH:

12
retroarch.c
View File

@ -3218,12 +3218,12 @@ void rarch_main_command(unsigned action)
break;
case RARCH_CMD_OVERLAY_INIT:
#ifdef HAVE_OVERLAY
if (*g_settings.input.overlay && g_settings.input.overlay[0] != '\0')
{
driver.overlay = input_overlay_new(g_settings.input.overlay);
if (!driver.overlay)
RARCH_ERR("Failed to load overlay.\n");
}
if (!*g_settings.input.overlay)
break;
driver.overlay = input_overlay_new(g_settings.input.overlay);
if (!driver.overlay)
RARCH_ERR("Failed to load overlay.\n");
#endif
break;
case RARCH_CMD_OVERLAY_DEINIT: