ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

menu_cbs_ok.c - Code de-duplication

This commit is contained in:
twinaphex 2015-09-03 21:53:01 +02:00
parent b203f10061
commit e5c2ec8dcb
1 changed files with 49 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
menu/cbs/menu_cbs_ok.c
View File

@ -1709,54 +1709,72 @@ error:
return -1; return -1;
} }
static int action_ok_open_archive_detect_core(const char *path, enum
const char *label, unsigned type, size_t idx, size_t entry_idx) {
ACTION_OK_DL_DEFAULT = 0,
ACTION_OK_DL_OPEN_ARCHIVE,
ACTION_OK_DL_OPEN_ARCHIVE_DETECT_CORE
};
static int generic_action_ok_displaylist_push(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx,
unsigned action_type)
{ {
menu_displaylist_info_t info = {0}; menu_displaylist_info_t info = {0};
menu_list_t *menu_list = menu_list_get_ptr(); menu_list_t *menu_list = menu_list_get_ptr();
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
const char *menu_path = menu ? menu->scratch2_buf : NULL; const char *menu_path = NULL;
const char *content_path = menu ? menu->scratch_buf : NULL; const char *content_path = NULL;
if (!menu_list) if (!menu_list)
return -1; return -1;
fill_pathname_join(detect_content_path, menu_path, content_path, switch (action_type)
sizeof(detect_content_path)); {
case ACTION_OK_DL_OPEN_ARCHIVE_DETECT_CORE:
if (menu)
{
menu_path = menu->scratch2_buf;
content_path = menu->scratch_buf;
}
fill_pathname_join(detect_content_path, menu_path, content_path,
sizeof(detect_content_path));
switch (action_type)
{
case ACTION_OK_DL_OPEN_ARCHIVE_DETECT_CORE:
strlcpy(info.label,
menu_hash_to_str(MENU_LABEL_DEFERRED_ARCHIVE_OPEN_DETECT_CORE),
sizeof(info.label));
break;
case ACTION_OK_DL_OPEN_ARCHIVE:
strlcpy(info.label,
menu_hash_to_str(MENU_LABEL_DEFERRED_ARCHIVE_OPEN), sizeof(info.label));
break;
}
strlcpy(info.path, path, sizeof(info.path));
break;
}
info.list = menu_list->menu_stack; info.list = menu_list->menu_stack;
info.type = 0; info.type = type;
info.directory_ptr = 0; info.directory_ptr = idx;
strlcpy(info.path, path, sizeof(info.path));
strlcpy(info.label,
menu_hash_to_str(MENU_LABEL_DEFERRED_ARCHIVE_OPEN_DETECT_CORE), sizeof(info.label));
return menu_displaylist_push_list(&info, DISPLAYLIST_GENERIC); return menu_displaylist_push_list(&info, DISPLAYLIST_GENERIC);
} }
static int action_ok_open_archive_detect_core(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx)
{
return generic_action_ok_displaylist_push(path, label, 0, 0, entry_idx,
ACTION_OK_DL_OPEN_ARCHIVE_DETECT_CORE);
}
static int action_ok_open_archive(const char *path, static int action_ok_open_archive(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)
{ {
menu_displaylist_info_t info = {0}; return generic_action_ok_displaylist_push(path, label, 0, 0, entry_idx,
menu_list_t *menu_list = menu_list_get_ptr(); ACTION_OK_DL_OPEN_ARCHIVE);
menu_handle_t *menu = menu_driver_get_ptr();
const char *menu_path = menu ? menu->scratch2_buf : NULL;
const char *content_path = menu ? menu->scratch_buf : NULL;
if (!menu_list)
return -1;
fill_pathname_join(detect_content_path, menu_path, content_path,
sizeof(detect_content_path));
info.list = menu_list->menu_stack;
info.type = 0;
info.directory_ptr = 0;
strlcpy(info.path, path, sizeof(info.path));
strlcpy(info.label,
menu_hash_to_str(MENU_LABEL_DEFERRED_ARCHIVE_OPEN), sizeof(info.label));
return menu_displaylist_push_list(&info, DISPLAYLIST_GENERIC);
} }
static int action_ok_load_archive(const char *path, static int action_ok_load_archive(const char *path,