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

Start adding detect core selection if entry in content

Browse Source 
collection doesn't have an associated core yet
This commit is contained in:
twinaphex 2015-05-26 04:52:16 +02:00
parent 9b2887fc42
commit 50700ed7d3
1 changed files with 57 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
menu/menu_entries_cbs_ok.c
View File

@ -40,9 +40,54 @@ static int menu_action_setting_set_current_string_path(
return menu_setting_generic(setting);
}
static int action_ok_file_load_with_detect_core(const char *path,
const char *label, unsigned type, size_t idx)
{
int ret;
menu_displaylist_info_t info = {0};
const char *menu_path = NULL;
menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr();
global_t *global = global_get_ptr();
if (!menu)
return -1;
menu_list_get_last_stack(menu->menu_list,
&menu_path, NULL, NULL);
ret = rarch_defer_core(global->core_info,
menu_path, path, label, menu->deferred_path,
sizeof(menu->deferred_path));
if (ret == -1)
{
event_command(EVENT_CMD_LOAD_CORE);
menu_entries_common_load_content(false);
return -1;
}
if (ret == 0)
{
info.list = menu->menu_list->menu_stack;
info.type = 0;
info.directory_ptr = idx;
strlcpy(info.path, settings->libretro_directory, sizeof(info.path));
strlcpy(info.label, "deferred_core_list", sizeof(info.label));
ret = menu_displaylist_push_list(&info, DISPLAYLIST_GENERIC);
}
return ret;
}
static int action_ok_playlist_entry(const char *path,
const char *label, unsigned type, size_t idx)
{
const char *entry_path = NULL;
const char *entry_label = NULL;
const char *core_path = NULL;
const char *core_name = NULL;
size_t selection_ptr = 0;
content_playlist_t *playlist = g_defaults.history;
menu_handle_t *menu = menu_driver_get_ptr();
@ -63,6 +108,18 @@ static int action_ok_playlist_entry(const char *path,
if (!strcmp(label, "rdb_entry_start_game"))
selection_ptr = rdb_entry_start_game_selection_ptr;
content_playlist_get_index(playlist, idx,
&entry_path, &entry_label, &core_path, &core_name, NULL);
#if 0
RARCH_LOG("path: %s, label: %s, core path: %s, core name: %s\n", entry_path, entry_label,
core_path, core_name);
#endif
if (!strcmp(core_path, "DETECT") && !strcmp(core_name, "DETECT"))
return action_ok_file_load_with_detect_core(entry_path, label, type, idx);
rarch_playlist_load_content(playlist, selection_ptr);
menu_list_flush_stack(menu->menu_list, NULL, MENU_SETTINGS);
@ -968,46 +1025,6 @@ static int action_ok_disk_image_append(const char *path,
return -1;
}
static int action_ok_file_load_with_detect_core(const char *path,
const char *label, unsigned type, size_t idx)
{
int ret;
menu_displaylist_info_t info = {0};
const char *menu_path = NULL;
menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr();
global_t *global = global_get_ptr();
if (!menu)
return -1;
menu_list_get_last_stack(menu->menu_list,
&menu_path, NULL, NULL);
ret = rarch_defer_core(global->core_info,
menu_path, path, label, menu->deferred_path,
sizeof(menu->deferred_path));
if (ret == -1)
{
event_command(EVENT_CMD_LOAD_CORE);
menu_entries_common_load_content(false);
return -1;
}
if (ret == 0)
{
info.list = menu->menu_list->menu_stack;
info.type = 0;
info.directory_ptr = idx;
strlcpy(info.path, settings->libretro_directory, sizeof(info.path));
strlcpy(info.label, "deferred_core_list", sizeof(info.label));
ret = menu_displaylist_push_list(&info, DISPLAYLIST_GENERIC);
}
return ret;
}
static int action_ok_file_load(const char *path,
const char *label, unsigned type, size_t idx)