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

(XMB) Cleanups pt. 2

This commit is contained in:
twinaphex 2015-02-11 06:11:25 +01:00
parent d8a0126203
commit d85a8d5452
1 changed files with 13 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
menu/drivers/xmb.c
View File

@ -461,13 +461,9 @@ static void xmb_selection_pointer_changed(void)
} }
} }
static void xmb_list_open_old(file_list_t *list, int dir, size_t current) static void xmb_list_open_old(xmb_handle_t *xmb, file_list_t *list, int dir, size_t current)
{ {
int i; int i;
xmb_handle_t *xmb = (xmb_handle_t*)driver.menu->userdata;
if (!xmb)
return;
for (i = 0; i < file_list_get_size(list); i++) for (i = 0; i < file_list_get_size(list); i++)
{ {
@ -488,13 +484,9 @@ static void xmb_list_open_old(file_list_t *list, int dir, size_t current)
} }
} }
static void xmb_list_open_new(file_list_t *list, int dir, size_t current) static void xmb_list_open_new(xmb_handle_t *xmb, file_list_t *list, int dir, size_t current)
{ {
int i; int i;
xmb_handle_t *xmb = (xmb_handle_t*)driver.menu->userdata;
if (!xmb)
return;
for (i = 0; i < file_list_get_size(list); i++) for (i = 0; i < file_list_get_size(list); i++)
{ {
@ -586,20 +578,16 @@ static xmb_node_t* xmb_node_for_core(int i)
return node; return node;
} }
static void xmb_list_switch_old(file_list_t *list, int dir, size_t current) static void xmb_list_switch_old(xmb_handle_t *xmb, file_list_t *list, int dir, size_t current)
{ {
int i; int i;
xmb_handle_t *xmb = (xmb_handle_t*)driver.menu->userdata;
if (!xmb)
return;
for (i = 0; i < file_list_get_size(list); i++) for (i = 0; i < file_list_get_size(list); i++)
{ {
xmb_node_t *node = (xmb_node_t*) xmb_node_t *node = (xmb_node_t*)
file_list_get_userdata_at_offset(list, i); file_list_get_userdata_at_offset(list, i);
if (!xmb) if (!node)
continue; continue;
menu_animation_push(driver.menu->animation, XMB_DELAY, 0, &node->alpha, EASING_IN_OUT_QUAD, NULL); menu_animation_push(driver.menu->animation, XMB_DELAY, 0, &node->alpha, EASING_IN_OUT_QUAD, NULL);
@ -608,13 +596,9 @@ static void xmb_list_switch_old(file_list_t *list, int dir, size_t current)
} }
} }
static void xmb_list_switch_new(file_list_t *list, int dir, size_t current) static void xmb_list_switch_new(xmb_handle_t *xmb, file_list_t *list, int dir, size_t current)
{ {
int i; int i;
xmb_handle_t *xmb = (xmb_handle_t*)driver.menu->userdata;
if (!xmb)
return;
for (i = 0; i < file_list_get_size(list); i++) for (i = 0; i < file_list_get_size(list); i++)
{ {
@ -669,14 +653,10 @@ static void xmb_set_title(void)
} }
} }
static void xmb_list_open(void) static void xmb_list_open(xmb_handle_t *xmb)
{ {
unsigned j; unsigned j;
int dir = -1; int dir = -1;
xmb_handle_t *xmb = (xmb_handle_t*)driver.menu->userdata;
if (!xmb)
return;
if (driver.menu->cat_selection_ptr > xmb->cat_selection_ptr_old) if (driver.menu->cat_selection_ptr > xmb->cat_selection_ptr_old)
dir = 1; dir = 1;
@ -710,19 +690,15 @@ static void xmb_list_open(void)
if (driver.menu->cat_selection_ptr > xmb->cat_selection_ptr_old) if (driver.menu->cat_selection_ptr > xmb->cat_selection_ptr_old)
dir = 1; dir = 1;
xmb_list_switch_old(xmb->selection_buf_old, dir, xmb->selection_ptr_old); xmb_list_switch_old(xmb, xmb->selection_buf_old, dir, xmb->selection_ptr_old);
xmb_list_switch_new(driver.menu->menu_list->selection_buf, dir, driver.menu->selection_ptr); xmb_list_switch_new(xmb, driver.menu->menu_list->selection_buf, dir, driver.menu->selection_ptr);
xmb->active_category_old = driver.menu->cat_selection_ptr; xmb->active_category_old = driver.menu->cat_selection_ptr;
} }
static void xmb_list_switch(void) static void xmb_list_switch(xmb_handle_t *xmb)
{ {
unsigned j; unsigned j;
int dir = 0; int dir = 0;
xmb_handle_t *xmb = (xmb_handle_t*)driver.menu->userdata;
if (!xmb)
return;
xmb->depth = file_list_get_size(driver.menu->menu_list->menu_stack); xmb->depth = file_list_get_size(driver.menu->menu_list->menu_stack);
@ -748,8 +724,8 @@ static void xmb_list_switch(void)
&node->alpha, EASING_IN_OUT_QUAD, NULL); &node->alpha, EASING_IN_OUT_QUAD, NULL);
} }
xmb_list_open_old(xmb->selection_buf_old, dir, xmb->selection_ptr_old); xmb_list_open_old(xmb, xmb->selection_buf_old, dir, xmb->selection_ptr_old);
xmb_list_open_new(driver.menu->menu_list->selection_buf, dir, driver.menu->selection_ptr); xmb_list_open_new(xmb, driver.menu->menu_list->selection_buf, dir, driver.menu->selection_ptr);
switch (xmb->depth) switch (xmb->depth)
{ {
@ -787,9 +763,9 @@ static void xmb_populate_entries(void *data, const char *path,
xmb_set_title(); xmb_set_title();
if (driver.menu->cat_selection_ptr != xmb->active_category_old) if (driver.menu->cat_selection_ptr != xmb->active_category_old)
xmb_list_open(); xmb_list_open(xmb);
else else
xmb_list_switch(); xmb_list_switch(xmb);
} }
static void xmb_draw_items(xmb_handle_t *xmb, gl_t *gl, static void xmb_draw_items(xmb_handle_t *xmb, gl_t *gl,