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

Split up archive extract/load code into separate functions

Browse Source
This commit is contained in:
twinaphex 2014-11-14 15:38:11 +01:00
parent f921d2e2d4
commit 68798ede0a
1 changed files with 43 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
menu/backend/menu_common_backend.c
View File

@ -429,6 +429,47 @@ static void menu_common_load_content(void)
driver.menu->msg_force = true;
}
static int menu_archive_extract(const char *menu_path, const char *path,
const char *menu_label, unsigned int type)
{
char cat_path[PATH_MAX];
fill_pathname_join(cat_path, menu_path, path, sizeof(cat_path));
menu_list_push_stack_refresh(
driver.menu->menu_list,
cat_path,
menu_label,
type,
driver.menu->selection_ptr);
return 0;
}
static int menu_archive_load(const char *menu_path, const char *path,
const char *menu_label, unsigned int type)
{
int ret = rarch_defer_core(g_extern.core_info, menu_path, path,
driver.menu->deferred_path, sizeof(driver.menu->deferred_path));
switch (ret)
{
case -1:
rarch_main_command(RARCH_CMD_LOAD_CORE);
menu_common_load_content();
break;
case 0:
menu_list_push_stack_refresh(
driver.menu->menu_list,
g_settings.libretro_directory,
"deferred_core_list",
0,
driver.menu->selection_ptr);
break;
}
return 0;
}
static int menu_load_or_open_zip_iterate(unsigned action)
{
char msg[PATH_MAX];
@ -470,37 +511,10 @@ static int menu_load_or_open_zip_iterate(unsigned action)
switch (action)
{
case MENU_ACTION_OK:
{
char cat_path[PATH_MAX];
fill_pathname_join(cat_path, menu_path, path, sizeof(cat_path));
menu_list_push_stack_refresh(
driver.menu->menu_list,
cat_path,
menu_label,
type,
driver.menu->selection_ptr);
}
menu_archive_extract(menu_path, path, menu_label, type);
break;
case MENU_ACTION_CANCEL:
{
int ret = rarch_defer_core(g_extern.core_info, menu_path, path,
driver.menu->deferred_path, sizeof(driver.menu->deferred_path));
if (ret == -1)
{
rarch_main_command(RARCH_CMD_LOAD_CORE);
menu_common_load_content();
return -1;
}
else if (ret == 0)
menu_list_push_stack_refresh(
driver.menu->menu_list,
g_settings.libretro_directory,
"deferred_core_list",
0,
driver.menu->selection_ptr);
}
menu_archive_load(menu_path, path, menu_label, type);
break;
}