mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-18 14:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

(menu_entries_cbs.c) Killoff some code duplication

Browse Source
This commit is contained in:
twinaphex 2015-01-19 06:46:47 +01:00
parent 7a794b2ef1
commit 0fb02bc109
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
menu/menu_entries_cbs.c
View File

@ -116,11 +116,8 @@ unsigned menu_gx_resolutions[GX_RESOLUTIONS_LAST][2] = {
unsigned menu_current_gx_resolution = GX_RESOLUTIONS_640_480; unsigned menu_current_gx_resolution = GX_RESOLUTIONS_640_480;
#endif #endif
int menu_action_setting_set_current_string( static int menu_action_generic_setting(rarch_setting_t *setting)
rarch_setting_t *setting, const char *str)
{ {
strlcpy(setting->value.string, str, setting->size);
if (setting->change_handler) if (setting->change_handler)
setting->change_handler(setting); setting->change_handler(setting);
@ -134,6 +131,13 @@ int menu_action_setting_set_current_string(
return 0; return 0;
} }
int menu_action_setting_set_current_string(
rarch_setting_t *setting, const char *str)
{
strlcpy(setting->value.string, str, setting->size);
return menu_action_generic_setting(setting);
}
static void common_load_content(bool persist) static void common_load_content(bool persist)
{ {
rarch_main_command(persist ? RARCH_CMD_LOAD_CONTENT_PERSIST : RARCH_CMD_LOAD_CONTENT); rarch_main_command(persist ? RARCH_CMD_LOAD_CONTENT_PERSIST : RARCH_CMD_LOAD_CONTENT);
@ -637,18 +641,7 @@ static int menu_action_setting_set_current_string_path(
rarch_setting_t *setting, const char *dir, const char *path) rarch_setting_t *setting, const char *dir, const char *path)
{ {
fill_pathname_join(setting->value.string, dir, path, setting->size); fill_pathname_join(setting->value.string, dir, path, setting->size);
return menu_action_generic_setting(setting);
if (setting->change_handler)
setting->change_handler(setting);
if (setting->flags & SD_FLAG_EXIT
&& setting->cmd_trigger.triggered)
{
setting->cmd_trigger.triggered = false;
return -1;
}
return 0;
} }
static int action_ok_file_load(const char *path, static int action_ok_file_load(const char *path,