mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-20 06:40:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2017-05-17 03:30:37 +02:00
parent 5dcebe4718
commit 4436d5998b
2 changed files with 18 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
menu/menu_driver.c
View File

@ -649,8 +649,10 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
case RARCH_MENU_CTL_DEINIT: case RARCH_MENU_CTL_DEINIT:
if (menu_driver_ctx && menu_driver_ctx->context_destroy) if (menu_driver_ctx && menu_driver_ctx->context_destroy)
menu_driver_ctx->context_destroy(menu_userdata); menu_driver_ctx->context_destroy(menu_userdata);
if (menu_driver_ctl(RARCH_MENU_CTL_OWNS_DRIVER, NULL))
if (menu_driver_data_own)
return true; return true;
menu_driver_ctl(RARCH_MENU_CTL_PLAYLIST_FREE, NULL); menu_driver_ctl(RARCH_MENU_CTL_PLAYLIST_FREE, NULL);
menu_shader_manager_free(); menu_shader_manager_free();
@ -702,30 +704,6 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
case RARCH_MENU_CTL_UNSET_LOAD_NO_CONTENT: case RARCH_MENU_CTL_UNSET_LOAD_NO_CONTENT:
menu_driver_load_no_content = false; menu_driver_load_no_content = false;
break; break;
case RARCH_MENU_CTL_NAVIGATION_ASCEND_ALPHABET:
{
size_t *ptr_out = (size_t*)data;
if (!ptr_out)
return false;
if (menu_driver_ctx->navigation_ascend_alphabet)
menu_driver_ctx->navigation_ascend_alphabet(
menu_userdata, ptr_out);
}
break;
case RARCH_MENU_CTL_NAVIGATION_DESCEND_ALPHABET:
{
size_t *ptr_out = (size_t*)data;
if (!ptr_out)
return false;
if (menu_driver_ctx->navigation_descend_alphabet)
menu_driver_ctx->navigation_descend_alphabet(
menu_userdata, ptr_out);
}
break;
case RARCH_MENU_CTL_LIST_GET_ENTRY: case RARCH_MENU_CTL_LIST_GET_ENTRY:
{ {
menu_ctx_list_t *list = (menu_ctx_list_t*)data; menu_ctx_list_t *list = (menu_ctx_list_t*)data;
@ -1088,21 +1066,21 @@ bool menu_navigation_ctl(enum menu_navigation_ctl_state state, void *data)
ptr = *ptr_out; ptr = *ptr_out;
if (ptr == scroll_index_list[scroll_index_size - 1]) if (ptr == scroll_index_list[scroll_index_size - 1])
{
*ptr_out = menu_list_size - 1; *ptr_out = menu_list_size - 1;
menu_driver_ctl(RARCH_MENU_CTL_NAVIGATION_ASCEND_ALPHABET, ptr_out); else
return true; {
while (i < scroll_index_size - 1
&& scroll_index_list[i + 1] <= ptr)
i++;
*ptr_out = scroll_index_list[i + 1];
if (*ptr_out >= menu_list_size)
*ptr_out = menu_list_size - 1;
} }
while (i < scroll_index_size - 1 if (menu_driver_ctx->navigation_ascend_alphabet)
&& scroll_index_list[i + 1] <= ptr) menu_driver_ctx->navigation_ascend_alphabet(
i++; menu_userdata, ptr_out);
*ptr_out = scroll_index_list[i + 1];
if (*ptr_out >= menu_list_size)
*ptr_out = menu_list_size - 1;
menu_driver_ctl(RARCH_MENU_CTL_NAVIGATION_ASCEND_ALPHABET, ptr_out);
} }
break; break;
case MENU_NAVIGATION_CTL_DESCEND_ALPHABET: case MENU_NAVIGATION_CTL_DESCEND_ALPHABET:
@ -1125,8 +1103,9 @@ bool menu_navigation_ctl(enum menu_navigation_ctl_state state, void *data)
i--; i--;
*ptr_out = scroll_index_list[i - 1]; *ptr_out = scroll_index_list[i - 1];
menu_driver_ctl( if (menu_driver_ctx->navigation_descend_alphabet)
RARCH_MENU_CTL_NAVIGATION_DESCEND_ALPHABET, ptr_out); menu_driver_ctx->navigation_descend_alphabet(
menu_userdata, ptr_out);
} }
break; break;
case MENU_NAVIGATION_CTL_CLEAR_SCROLL_INDICES: case MENU_NAVIGATION_CTL_CLEAR_SCROLL_INDICES:

2
menu/menu_driver.h
View File

@ -82,8 +82,6 @@ enum rarch_menu_ctl_state
{ {
RARCH_MENU_CTL_NONE = 0, RARCH_MENU_CTL_NONE = 0,
RARCH_MENU_CTL_REFRESH, RARCH_MENU_CTL_REFRESH,
RARCH_MENU_CTL_NAVIGATION_ASCEND_ALPHABET,
RARCH_MENU_CTL_NAVIGATION_DESCEND_ALPHABET,
RARCH_MENU_CTL_SET_PENDING_QUICK_MENU, RARCH_MENU_CTL_SET_PENDING_QUICK_MENU,
RARCH_MENU_CTL_SET_PENDING_QUIT, RARCH_MENU_CTL_SET_PENDING_QUIT,
RARCH_MENU_CTL_SET_PENDING_SHUTDOWN, RARCH_MENU_CTL_SET_PENDING_SHUTDOWN,