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

(XMB) Use the populate entries callback, fixes the segfault

Browse Source
This commit is contained in:
Jean-André Santoni 2014-10-09 19:06:07 +02:00
parent 623e19edd5
commit 0dcf1949ad
1 changed files with 5 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
frontend/menu/disp/xmb.c
View File

@ -61,10 +61,8 @@ typedef struct
char xmb_title[256] = ""; char xmb_title[256] = "";
char xmb_oldtitle[256] = ""; int selptr = 0;
int selptr = -1; int oldselptr = 0;
int oldselptr = -1;
enum enum
{ {
@ -372,7 +370,8 @@ static void xmb_selection_pointer_changed(void)
oldselptr = selptr; oldselptr = selptr;
} }
static void xmb_screen_changed(void) static void xmb_populate_entries(void *data, const char *path,
const char *labell, unsigned ii)
{ {
int i; int i;
const char *dir = NULL; const char *dir = NULL;
@ -434,8 +433,6 @@ static void xmb_screen_changed(void)
node->zoom = i == selptr ? 1.0 : 0.5; node->zoom = i == selptr ? 1.0 : 0.5;
node->y = iy; node->y = iy;
} }
memcpy(xmb_oldtitle, xmb_title, sizeof(xmb_oldtitle));
} }
static void xmb_frame(void) static void xmb_frame(void)
@ -462,25 +459,9 @@ static void xmb_frame(void)
file_list_get_last(driver.menu->menu_stack, &dir, &label, &menu_type); file_list_get_last(driver.menu->menu_stack, &dir, &label, &menu_type);
if (!strcmp(xmb_title, ""))
{
get_title(label, dir, menu_type, xmb_title, sizeof(xmb_title));
}
if (selptr == -1)
{
selptr = driver.menu->selection_ptr;
oldselptr = driver.menu->selection_ptr;
}
selptr = driver.menu->selection_ptr; selptr = driver.menu->selection_ptr;
get_title(label, dir, menu_type, xmb_title, sizeof(xmb_title)); get_title(label, dir, menu_type, xmb_title, sizeof(xmb_title));
if (strcmp(xmb_title, xmb_oldtitle))
{
xmb_screen_changed();
oldselptr = selptr;
}
if (selptr != oldselptr) if (selptr != oldselptr)
xmb_selection_pointer_changed(); xmb_selection_pointer_changed();
@ -510,20 +491,6 @@ static void xmb_frame(void)
{ {
xmb_node_t *node = (xmb_node_t*)&xmb->xmb_nodes[i]; xmb_node_t *node = (xmb_node_t*)&xmb->xmb_nodes[i];
/*float iy;
float ia = 0.5;
float iz = 0.5;
iy = i < selptr ? xmb_vspacing * (i - selptr + xmb_above_item_offset) :
xmb_vspacing * (i - selptr + xmb_under_item_offset);
if (i == selptr)
{
ia = 1.0;
iz = 1.0;
iy = xmb_vspacing * xmb_active_item_factor;
}*/
xmb_draw_icon(xmb->textures[RMB_TEXTURE_SETTING].id, xmb_draw_icon(xmb->textures[RMB_TEXTURE_SETTING].id,
xmb->xmb_margin_left + xmb->xmb_hspacing - xmb->xmb_icon_size/2.0, xmb->xmb_margin_left + xmb->xmb_hspacing - xmb->xmb_icon_size/2.0,
xmb->xmb_margin_top + node->y + xmb->xmb_icon_size/2.0, xmb->xmb_margin_top + node->y + xmb->xmb_icon_size/2.0,
@ -773,7 +740,7 @@ menu_ctx_driver_t menu_ctx_xmb = {
xmb_free, xmb_free,
xmb_context_reset, xmb_context_reset,
NULL, NULL,
NULL, xmb_populate_entries,
NULL, NULL,
NULL, NULL,
NULL, NULL,