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

Don't use menu_navigation_get_ptr

This commit is contained in:
twinaphex 2015-09-25 18:46:12 +02:00
parent 1d81096af7
commit 1932e65dde
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
menu/cbs/menu_cbs_down.c
View File

@ -19,13 +19,15 @@
static int action_bind_down_generic(unsigned type, const char *label)
{
size_t scroll_accel = 0;
unsigned scroll_speed = 0;
menu_navigation_t *nav = menu_navigation_get_ptr();
menu_list_t *menu_list = menu_list_get_ptr();
if (!menu_list || !nav)
if (!menu_list)
return -1;
if (!menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SCROLL_ACCEL, &scroll_accel))
return -1;
scroll_speed = (max(nav->scroll.acceleration, 2) - 2) / 4 + 1;
scroll_speed = (max(scroll_accel, 2) - 2) / 4 + 1;
if (menu_list_get_size(menu_list) <= 0)
return 0;

6
menu/cbs/menu_cbs_info.c
View File

@ -21,15 +21,17 @@
static int action_info_default(unsigned type, const char *label)
{
size_t selection = 0;
menu_displaylist_info_t info = {0};
menu_navigation_t *nav = menu_navigation_get_ptr();
menu_list_t *menu_list = menu_list_get_ptr();
if (!menu_list)
return 0;
if (!menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection))
return 0;
info.list = menu_list->menu_stack;
info.directory_ptr = nav->selection_ptr;
info.directory_ptr = selection;
strlcpy(info.label,
menu_hash_to_str(MENU_LABEL_INFO_SCREEN),
sizeof(info.label));

6
menu/cbs/menu_cbs_up.c
View File

@ -19,13 +19,15 @@
static int action_bind_up_generic(unsigned type, const char *label)
{
size_t scroll_accel = 0;
unsigned scroll_speed = 0;
menu_navigation_t *nav = menu_navigation_get_ptr();
menu_list_t *menu_list = menu_list_get_ptr();
if (!menu_list)
return -1;
if (!menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SCROLL_ACCEL, &scroll_accel))
return -1;
scroll_speed = (max(nav->scroll.acceleration, 2) - 2) / 4 + 1;
scroll_speed = (max(scroll_accel, 2) - 2) / 4 + 1;
if (menu_list_get_size(menu_list) <= 0)
return 0;