mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 21:32:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Create MENU_ENTRIES_NEEDS_REFRESH

Browse Source
This commit is contained in:
twinaphex 2021-03-07 20:00:45 +01:00
parent db314cf5df
commit 0518f6e13e
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
retroarch.c
View File

@ -1874,7 +1874,7 @@ static int generic_menu_iterate(
p_rarch->menu_driver_is_binding = iterate_type == ITERATE_TYPE_BIND; p_rarch->menu_driver_is_binding = iterate_type == ITERATE_TYPE_BIND;
if ( action != MENU_ACTION_NOOP if ( action != MENU_ACTION_NOOP
|| menu_entries_ctl(MENU_ENTRIES_CTL_NEEDS_REFRESH, NULL) || MENU_ENTRIES_NEEDS_REFRESH(menu_st)
|| GFX_DISPLAY_GET_UPDATE_PENDING(p_anim, p_disp)) || GFX_DISPLAY_GET_UPDATE_PENDING(p_anim, p_disp))
{ {
BIT64_SET(menu->state, MENU_STATE_RENDER_FRAMEBUFFER); BIT64_SET(menu->state, MENU_STATE_RENDER_FRAMEBUFFER);
@ -2285,7 +2285,7 @@ int generic_menu_entry_action(
if (cbs && cbs->action_refresh) if (cbs && cbs->action_refresh)
{ {
if (menu_entries_ctl(MENU_ENTRIES_CTL_NEEDS_REFRESH, NULL)) if (MENU_ENTRIES_NEEDS_REFRESH(menu_st))
{ {
bool refresh = false; bool refresh = false;
struct menu_state struct menu_state
@ -2404,7 +2404,7 @@ void menu_entry_get(menu_entry_t *entry, size_t stack_idx,
menu_file_list_cbs_t *cbs = NULL; menu_file_list_cbs_t *cbs = NULL;
struct rarch_state *p_rarch = &rarch_st; struct rarch_state *p_rarch = &rarch_st;
struct menu_state *menu_st = &p_rarch->menu_driver_state; struct menu_state *menu_st = &p_rarch->menu_driver_state;
file_list_t *selection_buf = MENU_ENTRIES_GET_SELECTION_BUF_PTR_INTERNAL(stack_idx); file_list_t *selection_buf = MENU_ENTRIES_GET_SELECTION_BUF_PTR_INTERNAL(menu_st, stack_idx);
file_list_t *list = (userdata) ? (file_list_t*)userdata : selection_buf; file_list_t *list = (userdata) ? (file_list_t*)userdata : selection_buf;
bool path_enabled = entry->path_enabled; bool path_enabled = entry->path_enabled;
@ -3132,7 +3132,7 @@ void menu_entries_prepend(file_list_t *list,
unsigned type, size_t directory_ptr, size_t entry_idx) unsigned type, size_t directory_ptr, size_t entry_idx)
{ {
menu_ctx_list_t list_info; menu_ctx_list_t list_info;
size_t idx; size_t idx = 0;
const char *menu_path = NULL; const char *menu_path = NULL;
menu_file_list_cbs_t *cbs = NULL; menu_file_list_cbs_t *cbs = NULL;
struct rarch_state *p_rarch = &rarch_st; struct rarch_state *p_rarch = &rarch_st;
@ -3143,8 +3143,6 @@ void menu_entries_prepend(file_list_t *list,
menu_entries_get_last_stack(&menu_path, NULL, NULL, NULL, NULL); menu_entries_get_last_stack(&menu_path, NULL, NULL, NULL, NULL);
idx = 0;
list_info.fullpath = NULL; list_info.fullpath = NULL;
if (!string_is_empty(menu_path)) if (!string_is_empty(menu_path))
@ -3296,11 +3294,7 @@ bool menu_entries_ctl(enum menu_entries_ctl_state state, void *data)
switch (state) switch (state)
{ {
case MENU_ENTRIES_CTL_NEEDS_REFRESH: case MENU_ENTRIES_CTL_NEEDS_REFRESH:
if (menu_st->entries_nonblocking_refresh) return MENU_ENTRIES_NEEDS_REFRESH(menu_st);
return false;
if (!menu_st->entries_need_refresh)
return false;
break;
case MENU_ENTRIES_CTL_SETTINGS_GET: case MENU_ENTRIES_CTL_SETTINGS_GET:
{ {
rarch_setting_t **settings = (rarch_setting_t**)data; rarch_setting_t **settings = (rarch_setting_t**)data;

3
retroarch_data.h
View File

@ -284,7 +284,8 @@
#define MENU_LIST_GET_STACK_SIZE(list, idx) ((list)->menu_stack[(idx)]->size) #define MENU_LIST_GET_STACK_SIZE(list, idx) ((list)->menu_stack[(idx)]->size)
#define MENU_ENTRIES_GET_SELECTION_BUF_PTR_INTERNAL(idx) ((menu_st->entries.list) ? MENU_LIST_GET_SELECTION(menu_st->entries.list, (unsigned)idx) : NULL) #define MENU_ENTRIES_GET_SELECTION_BUF_PTR_INTERNAL(menu_st, idx) ((menu_st->entries.list) ? MENU_LIST_GET_SELECTION(menu_st->entries.list, (unsigned)idx) : NULL)
#define MENU_ENTRIES_NEEDS_REFRESH(menu_st) (!(menu_st->entries_nonblocking_refresh || !menu_st->entries_need_refresh))
#endif #endif
#define CDN_URL "https://cdn.discordapp.com/avatars" #define CDN_URL "https://cdn.discordapp.com/avatars"