mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

(menu_cbs_ok.c) Cut down on code duplication

Browse Source
This commit is contained in:
twinaphex 2015-09-03 22:20:43 +02:00
parent 8fec2bd68d
commit 29cd1d0087
1 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
menu/cbs/menu_cbs_ok.c
View File

@ -173,26 +173,6 @@ static int action_ok_file_load_detect_core(const char *path,
return -1; return -1;
} }
static int action_ok_rpl_entry(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx)
{
menu_handle_t *menu = menu_driver_get_ptr();
menu_displaylist_info_t info = {0};
menu_list_t *menu_list = menu_list_get_ptr();
if (!menu_list)
return -1;
strlcpy(menu->deferred_path, label, sizeof(menu->deferred_path));
info.list = menu_list->menu_stack;
info.type = 0;
info.directory_ptr = idx;
rpl_entry_selection_ptr = idx;
strlcpy(info.label, menu_hash_to_str(MENU_LABEL_DEFERRED_RPL_ENTRY_ACTIONS), sizeof(info.label));
return menu_displaylist_push_list(&info, DISPLAYLIST_GENERIC);
}
static int action_ok_playlist_entry(const char *path, static int action_ok_playlist_entry(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx) const char *label, unsigned type, size_t idx, size_t entry_idx)
@ -1714,9 +1694,11 @@ enum
ACTION_OK_DL_DEFAULT = 0, ACTION_OK_DL_DEFAULT = 0,
ACTION_OK_DL_OPEN_ARCHIVE, ACTION_OK_DL_OPEN_ARCHIVE,
ACTION_OK_DL_OPEN_ARCHIVE_DETECT_CORE, ACTION_OK_DL_OPEN_ARCHIVE_DETECT_CORE,
ACTION_OK_DL_HELP ACTION_OK_DL_HELP,
ACTION_OK_RPL_ENTRY
}; };
static int generic_action_ok_displaylist_push(const char *path, static int generic_action_ok_displaylist_push(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx, const char *label, unsigned type, size_t idx, size_t entry_idx,
unsigned action_type) unsigned action_type)
@ -1764,6 +1746,14 @@ static int generic_action_ok_displaylist_push(const char *path,
menu->push_help_screen = true; menu->push_help_screen = true;
dl_type = DISPLAYLIST_HELP; dl_type = DISPLAYLIST_HELP;
break; break;
case ACTION_OK_RPL_ENTRY:
strlcpy(menu->deferred_path, label, sizeof(menu->deferred_path));
strlcpy(info.label,
menu_hash_to_str(MENU_LABEL_DEFERRED_RPL_ENTRY_ACTIONS), sizeof(info.label));
info.type = 0;
info.directory_ptr = idx;
rpl_entry_selection_ptr = idx;
break;
} }
info.list = menu_list->menu_stack; info.list = menu_list->menu_stack;
@ -1771,6 +1761,13 @@ static int generic_action_ok_displaylist_push(const char *path,
return menu_displaylist_push_list(&info, dl_type); return menu_displaylist_push_list(&info, dl_type);
} }
static int action_ok_rpl_entry(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx)
{
return generic_action_ok_displaylist_push(path, label, type, idx,
entry_idx, ACTION_OK_RPL_ENTRY);
}
static int generic_action_ok_help(const char *path, static int generic_action_ok_help(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx, const char *label, unsigned type, size_t idx, size_t entry_idx,
unsigned id, menu_help_type_t id2) unsigned id, menu_help_type_t id2)