mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 12:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of menu_hash_calculate dependency in find_first_core

Browse Source
This commit is contained in:
twinaphex 2016-06-14 22:11:10 +02:00
parent fcda911a10
commit 27ef0cf9c7
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
menu/cbs/menu_cbs_ok.c
View File

@ -492,7 +492,7 @@ static int file_load_with_detect_core_wrapper(size_t idx, size_t entry_idx,
def_info.s = menu->deferred_path;
def_info.len = sizeof(menu->deferred_path);
if (menu_content_ctl(MENU_CONTENT_CTL_FIND_FIRST_CORE, &def_info))
if (menu_content_find_first_core(&def_info, false))
ret = -1;
if ( !is_carchive && !string_is_empty(path)
@ -2208,7 +2208,7 @@ static int action_ok_load_archive_detect_core(const char *path,
def_info.s = menu->deferred_path;
def_info.len = sizeof(menu->deferred_path);
if (menu_content_ctl(MENU_CONTENT_CTL_FIND_FIRST_CORE, &def_info))
if (menu_content_find_first_core(&def_info, false))
ret = -1;
fill_pathname_join(detect_content_path, menu_path, content_path,

8
menu/menu_content.c
View File

@ -125,18 +125,16 @@ error:
* selection needs to be made from a list, otherwise
* returns true and fills in @s with path to core.
**/
static bool menu_content_find_first_core(menu_content_ctx_defer_info_t *def_info)
bool menu_content_find_first_core(menu_content_ctx_defer_info_t *def_info, bool load_content_with_current_core)
{
char new_core_path[PATH_MAX_LENGTH] = {0};
const core_info_t *info = NULL;
core_info_list_t *core_info = NULL;
const char *default_info_dir = NULL;
size_t supported = 0;
uint32_t menu_label_hash = 0;
if (def_info)
{
menu_label_hash = menu_hash_calculate(def_info->menu_label);
core_info = (core_info_list_t*)def_info->data;
default_info_dir = def_info->dir;
}
@ -170,7 +168,7 @@ static bool menu_content_find_first_core(menu_content_ctx_defer_info_t *def_info
/* We started the menu with 'Load Content', we are
* going to use the current core to load this. */
if (menu_label_hash == MENU_LABEL_LOAD_CONTENT)
if (load_content_with_current_core)
{
core_info_get_current_core((core_info_t**)&info);
if (info)
@ -201,8 +199,6 @@ bool menu_content_ctl(enum menu_content_ctl_state state, void *data)
{
switch (state)
{
case MENU_CONTENT_CTL_FIND_FIRST_CORE:
return menu_content_find_first_core((menu_content_ctx_defer_info_t*)data);
case MENU_CONTENT_CTL_LOAD_PLAYLIST:
return menu_content_load_from_playlist((menu_content_ctx_playlist_info_t*)data);
case MENU_CONTENT_CTL_NONE:

2
menu/menu_content.h
View File

@ -60,6 +60,8 @@ typedef struct menu_content_ctx_defer_info
size_t len;
} menu_content_ctx_defer_info_t;
bool menu_content_find_first_core(menu_content_ctx_defer_info_t *def_info, bool load_content_with_current_core);
bool menu_content_ctl(enum menu_content_ctl_state state, void *data);
RETRO_END_DECLS