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

Implement archive_mode - 0 is 'Ask', '1' is 'Load archive', '2'

Browse Source 
is 'Open Archive'
This commit is contained in:
twinaphex 2014-11-14 15:58:49 +01:00
parent 68798ede0a
commit 746529671c
3 changed files with 66 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
general.h
View File

@ -370,6 +370,11 @@ struct settings
char autoconfig_dir[PATH_MAX];
} input;
struct
{
unsigned mode;
} archive;
int state_slot;
char core_options_path[PATH_MAX];

79
menu/backend/menu_common_backend.c
View File

@ -429,10 +429,24 @@ 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)
static int menu_archive_open(void)
{
char cat_path[PATH_MAX];
const char *menu_path = NULL;
const char *menu_label = NULL;
const char* path = NULL;
unsigned int type = 0;
menu_list_pop_stack(driver.menu->menu_list);
menu_list_get_last_stack(driver.menu->menu_list,
&menu_path, &menu_label, NULL);
if (menu_list_get_size(driver.menu->menu_list) == 0)
return 0;
menu_list_get_at_offset(driver.menu->menu_list->selection_buf,
driver.menu->selection_ptr, &path, NULL, &type);
fill_pathname_join(cat_path, menu_path, path, sizeof(cat_path));
menu_list_push_stack_refresh(
@ -445,10 +459,26 @@ static int menu_archive_extract(const char *menu_path, const char *path,
return 0;
}
static int menu_archive_load(const char *menu_path, const char *path,
const char *menu_label, unsigned int type)
static int menu_archive_load(void)
{
int ret = rarch_defer_core(g_extern.core_info, menu_path, path,
int ret;
const char *menu_path = NULL;
const char *menu_label = NULL;
const char* path = NULL;
unsigned int type = 0;
menu_list_pop_stack(driver.menu->menu_list);
menu_list_get_last_stack(driver.menu->menu_list,
&menu_path, &menu_label, NULL);
if (menu_list_get_size(driver.menu->menu_list) == 0)
return 0;
menu_list_get_at_offset(driver.menu->menu_list->selection_buf,
driver.menu->selection_ptr, &path, NULL, &type);
ret = rarch_defer_core(g_extern.core_info, menu_path, path,
driver.menu->deferred_path, sizeof(driver.menu->deferred_path));
switch (ret)
@ -473,10 +503,6 @@ static int menu_archive_load(const char *menu_path, const char *path,
static int menu_load_or_open_zip_iterate(unsigned action)
{
char msg[PATH_MAX];
const char *menu_path = NULL;
const char *menu_label = NULL;
const char* path = NULL;
unsigned int type = 0;
snprintf(msg, sizeof(msg), "Opening compressed file\n"
" \n"
@ -494,27 +520,10 @@ static int menu_load_or_open_zip_iterate(unsigned action)
switch (action)
{
case MENU_ACTION_OK:
case MENU_ACTION_CANCEL:
menu_list_pop_stack(driver.menu->menu_list);
menu_list_get_last_stack(driver.menu->menu_list,
&menu_path, &menu_label, NULL);
if (menu_list_get_size(driver.menu->menu_list) == 0)
return 0;
menu_list_get_at_offset(driver.menu->menu_list->selection_buf,
driver.menu->selection_ptr, &path, NULL, &type);
break;
}
switch (action)
{
case MENU_ACTION_OK:
menu_archive_extract(menu_path, path, menu_label, type);
menu_archive_open();
break;
case MENU_ACTION_CANCEL:
menu_archive_load(menu_path, path, menu_label, type);
menu_archive_load();
break;
}
@ -550,7 +559,19 @@ static int menu_common_iterate(unsigned action)
else if (!strcmp(label, "message"))
return menu_message_toggle(action);
else if (!strcmp(label, "load_open_zip"))
return menu_load_or_open_zip_iterate(action);
{
switch (g_settings.archive.mode)
{
case 0:
return menu_load_or_open_zip_iterate(action);
case 1:
return menu_archive_load();
case 2:
return menu_archive_open();
default:
break;
}
}
else if (!strcmp(label, "info_screen"))
return menu_info_screen_iterate(action);
else if (

11
settings_data.c
View File

@ -4586,6 +4586,17 @@ static bool setting_data_append_list_archive_options(
START_GROUP(group_info, "Archive Options");
START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info);
CONFIG_UINT(
g_settings.archive.mode,
"archive_mode",
"Archive Mode",
0,
group_info.name,
subgroup_info.name,
general_write_handler,
general_read_handler);
settings_list_current_add_range(list, list_info, 0, 2, 1, true, true);
END_SUB_GROUP(list, list_info);
END_GROUP(list, list_info);