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

Create xmb_node_get_core_info

This commit is contained in:
twinaphex 2015-06-07 16:39:40 +02:00
parent d5d350976c
commit ea891cae91
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
menu/drivers/xmb.c
View File

@ -605,10 +605,8 @@ static void xmb_list_open_new(xmb_handle_t *xmb,
xmb->old_depth = xmb->depth; xmb->old_depth = xmb->depth;
} }
static xmb_node_t *xmb_node_allocate_userdata(xmb_handle_t *xmb, core_info_t *xmb_node_get_core_info(core_info_t *info, unsigned i)
core_info_t *info, unsigned i)
{ {
xmb_node_t *node = NULL;
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
core_info_list_t *info_list = global ? (core_info_list_t*)global->core_info : NULL; core_info_list_t *info_list = global ? (core_info_list_t*)global->core_info : NULL;
size_t list_size = info_list ? info_list->count : 0; size_t list_size = info_list ? info_list->count : 0;
@ -622,6 +620,17 @@ static xmb_node_t *xmb_node_allocate_userdata(xmb_handle_t *xmb,
info = (core_info_t*)&info_list->list[i]; info = (core_info_t*)&info_list->list[i];
if (!info)
return NULL;
return info;
}
static xmb_node_t *xmb_node_allocate_userdata(xmb_handle_t *xmb,
core_info_t *info, unsigned i)
{
xmb_node_t *node = NULL;
info = xmb_node_get_core_info(info, i);
if (!info) if (!info)
return NULL; return NULL;
@ -653,24 +662,12 @@ static xmb_node_t *xmb_node_allocate_userdata(xmb_handle_t *xmb,
static xmb_node_t* xmb_get_userdata_from_core(xmb_handle_t *xmb, static xmb_node_t* xmb_get_userdata_from_core(xmb_handle_t *xmb,
core_info_t *info, unsigned i) core_info_t *info, unsigned i)
{ {
global_t *global = global_get_ptr(); info = xmb_node_get_core_info(info, i);
core_info_list_t *info_list = global ? (core_info_list_t*)global->core_info : NULL;
size_t list_size = info_list ? info_list->count : 0;
if (!info_list || list_size == 0)
return NULL;
rarch_assert(i >= 0);
rarch_assert(i <= list_size);
if (i >= list_size)
return NULL;
info = (core_info_t*)&info_list->list[i];
if (!info)
return NULL;
if (info)
return (xmb_node_t*)info->userdata; return (xmb_node_t*)info->userdata;
return NULL;
} }
static void xmb_push_animations(xmb_node_t *node, float ia, float ix) static void xmb_push_animations(xmb_node_t *node, float ia, float ix)