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

Cut down on menu_displaylist_info_t size - use flags instead of all 

these boolean members
This commit is contained in:
LibretroAdmin 2022-10-03 18:13:32 +02:00
parent 8c49eed56c
commit e5897caa8f
6 changed files with 235 additions and 249 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
menu/drivers/materialui.c
View File

@ -9404,9 +9404,9 @@ static int materialui_list_push(void *data, void *userdata,
MENU_ENUM_LABEL_MENU_FILE_BROWSER_SETTINGS, MENU_ENUM_LABEL_MENU_FILE_BROWSER_SETTINGS,
MENU_SETTING_ACTION, 0, 0, NULL); MENU_SETTING_ACTION, 0, 0, NULL);
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
info->need_refresh = true; info->flags |= MD_FLAG_NEED_REFRESH;
ret = 0; ret = 0;
} }
break; break;
case DISPLAYLIST_MAIN_MENU: case DISPLAYLIST_MAIN_MENU:
@ -9616,8 +9616,8 @@ static int materialui_list_push(void *data, void *userdata,
false); false);
} }
#endif #endif
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
ret = 0; ret = 0;
} }
break; break;
} }

12
menu/drivers/ozone.c
View File

@ -8680,9 +8680,9 @@ static int ozone_list_push(void *data, void *userdata,
MENU_SETTING_ACTION, 0, 0, NULL); MENU_SETTING_ACTION, 0, 0, NULL);
} }
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
info->need_refresh = true; info->flags |= MD_FLAG_NEED_REFRESH;
ret = 0; ret = 0;
} }
break; break;
case DISPLAYLIST_MAIN_MENU: case DISPLAYLIST_MAIN_MENU:
@ -8902,8 +8902,8 @@ static int ozone_list_push(void *data, void *userdata,
false); false);
} }
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
ret = 0; ret = 0;
} }
break; break;
} }
@ -11010,7 +11010,7 @@ static bool ozone_menu_init_list(void *data)
if (!menu_displaylist_ctl(DISPLAYLIST_MAIN_MENU, &info, settings)) if (!menu_displaylist_ctl(DISPLAYLIST_MAIN_MENU, &info, settings))
goto error; goto error;
info.need_push = true; info.flags |= MD_FLAG_NEED_PUSH;
if (!menu_displaylist_process(&info)) if (!menu_displaylist_process(&info))
goto error; goto error;

12
menu/drivers/xmb.c
View File

@ -7476,9 +7476,9 @@ static int xmb_list_push(void *data, void *userdata,
MENU_ENUM_LABEL_MENU_FILE_BROWSER_SETTINGS, MENU_ENUM_LABEL_MENU_FILE_BROWSER_SETTINGS,
MENU_SETTING_ACTION, 0, 0, NULL); MENU_SETTING_ACTION, 0, 0, NULL);
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
info->need_refresh = true; info->flags |= MD_FLAG_NEED_REFRESH;
ret = 0; ret = 0;
break; break;
case DISPLAYLIST_MAIN_MENU: case DISPLAYLIST_MAIN_MENU:
{ {
@ -7696,8 +7696,8 @@ static int xmb_list_push(void *data, void *userdata,
false); false);
} }
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
ret = 0; ret = 0;
} }
break; break;
} }
@ -7730,7 +7730,7 @@ static bool xmb_menu_init_list(void *data)
if (!menu_displaylist_ctl(DISPLAYLIST_MAIN_MENU, &info, settings)) if (!menu_displaylist_ctl(DISPLAYLIST_MAIN_MENU, &info, settings))
goto error; goto error;
info.need_push = true; info.flags |= MD_FLAG_NEED_PUSH;
if (!menu_displaylist_process(&info)) if (!menu_displaylist_process(&info))
goto error; goto error;

405
menu/menu_displaylist.c
View File

@ -1635,7 +1635,7 @@ static unsigned menu_displaylist_parse_supported_cores(menu_displaylist_info_t *
0, 0, 0, NULL)) 0, 0, 0, NULL))
count++; count++;
info->download_core = true; info->flags |= MD_FLAG_DOWNLOAD_CORE;
} }
} }
@ -2352,7 +2352,7 @@ static int menu_displaylist_parse_playlist(menu_displaylist_info_t *info,
return 0; return 0;
error: error:
info->need_push_no_playlist_entries = true; info->flags |= MD_FLAG_NEED_PUSH_NO_PLAYLIST_ENTRIES;
return 0; return 0;
} }
@ -3071,7 +3071,7 @@ static int menu_displaylist_parse_database_entry(menu_handle_t *menu,
} }
if (db_info->count < 1) if (db_info->count < 1)
info->need_push_no_playlist_entries = true; info->flags |= MD_FLAG_NEED_PUSH_NO_PLAYLIST_ENTRIES;
playlist_free(playlist); playlist_free(playlist);
database_info_list_free(db_info); database_info_list_free(db_info);
@ -4263,7 +4263,7 @@ static unsigned menu_displaylist_parse_cores(
} }
if (string_is_equal(info->label, msg_hash_to_str(MENU_ENUM_LABEL_CORE_LIST))) if (string_is_equal(info->label, msg_hash_to_str(MENU_ENUM_LABEL_CORE_LIST)))
info->download_core = true; info->flags |= MD_FLAG_DOWNLOAD_CORE;
dir_list_sort(str_list, true); dir_list_sort(str_list, true);
@ -4372,7 +4372,7 @@ static unsigned menu_displaylist_parse_cores(
file_list_set_alt_at_offset(info->list, i, display_name); file_list_set_alt_at_offset(info->list, i, display_name);
} }
} }
info->need_sort = true; info->flags |= MD_FLAG_NEED_SORT;
} }
return items_found; return items_found;
@ -5605,30 +5605,29 @@ static void wifi_scan_callback(retro_task_t *task,
bool menu_displaylist_process(menu_displaylist_info_t *info) bool menu_displaylist_process(menu_displaylist_info_t *info)
{ {
size_t idx = 0;
#ifdef HAVE_NETWORKING #ifdef HAVE_NETWORKING
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
#endif #endif
if (info->need_navigation_clear) if (info->flags & MD_FLAG_NEED_NAVIGATION_CLEAR)
{ {
bool pending_push = true; bool pending_push = true;
menu_driver_ctl(MENU_NAVIGATION_CTL_CLEAR, &pending_push); menu_driver_ctl(MENU_NAVIGATION_CTL_CLEAR, &pending_push);
} }
if (info->need_entries_refresh) if (info->flags & MD_FLAG_NEED_ENTRIES_REFRESH)
{ {
bool refresh = false; bool refresh = false;
menu_entries_ctl(MENU_ENTRIES_CTL_SET_REFRESH, &refresh); menu_entries_ctl(MENU_ENTRIES_CTL_SET_REFRESH, &refresh);
} }
if (info->need_sort) if (info->flags & MD_FLAG_NEED_SORT)
file_list_sort_on_alt(info->list); file_list_sort_on_alt(info->list);
#ifdef HAVE_NETWORKING #ifdef HAVE_NETWORKING
if (settings->bools.menu_show_core_updater && !settings->bools.kiosk_mode_enable) if (settings->bools.menu_show_core_updater && !settings->bools.kiosk_mode_enable)
{ {
if (info->download_core) if (info->flags & MD_FLAG_DOWNLOAD_CORE)
{ {
#ifdef HAVE_UPDATE_CORES #ifdef HAVE_UPDATE_CORES
menu_entries_append(info->list, menu_entries_append(info->list,
@ -5647,7 +5646,7 @@ bool menu_displaylist_process(menu_displaylist_info_t *info)
} }
#endif #endif
if (info->push_builtin_cores) if (info->flags & MD_FLAG_PUSH_BUILTIN_CORES)
{ {
#if defined(HAVE_VIDEOPROCESSOR) #if defined(HAVE_VIDEOPROCESSOR)
menu_entries_append(info->list, menu_entries_append(info->list,
@ -5666,15 +5665,15 @@ bool menu_displaylist_process(menu_displaylist_info_t *info)
#endif #endif
} }
if (info->need_refresh) if (info->flags & MD_FLAG_NEED_REFRESH)
menu_entries_ctl(MENU_ENTRIES_CTL_REFRESH, info->list); menu_entries_ctl(MENU_ENTRIES_CTL_REFRESH, info->list);
if (info->need_clear) if (info->flags & MD_FLAG_NEED_CLEAR)
menu_navigation_set_selection(idx); menu_navigation_set_selection(0);
if (info->need_push) if (info->flags & MD_FLAG_NEED_PUSH)
{ {
if (info->need_push_no_playlist_entries) if (info->flags & MD_FLAG_NEED_PUSH_NO_PLAYLIST_ENTRIES)
menu_entries_append(info->list, menu_entries_append(info->list,
msg_hash_to_str( msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_NO_PLAYLIST_ENTRIES_AVAILABLE), MENU_ENUM_LABEL_VALUE_NO_PLAYLIST_ENTRIES_AVAILABLE),
@ -5716,15 +5715,6 @@ void menu_displaylist_info_init(menu_displaylist_info_t *info)
return; return;
info->enum_idx = MSG_UNKNOWN; info->enum_idx = MSG_UNKNOWN;
info->need_sort = false;
info->need_refresh = false;
info->need_entries_refresh = false;
info->need_push_no_playlist_entries = false;
info->need_push = false;
info->need_clear = false;
info->push_builtin_cores = false;
info->download_core = false;
info->need_navigation_clear = false;
info->type = 0; info->type = 0;
info->type_default = 0; info->type_default = 0;
info->flags = 0; info->flags = 0;
@ -10971,24 +10961,24 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
} }
} }
#endif #endif
info->need_push = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_refresh = true; info->flags |= MD_FLAG_NEED_PUSH;
break; break;
case DISPLAYLIST_NETPLAY_KICK_LIST: case DISPLAYLIST_NETPLAY_KICK_LIST:
#ifdef HAVE_NETWORKING #ifdef HAVE_NETWORKING
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
count = menu_displaylist_netplay_kick(info->list); count = menu_displaylist_netplay_kick(info->list);
#endif #endif
info->need_push = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_refresh = true; info->flags |= MD_FLAG_NEED_PUSH;
break; break;
case DISPLAYLIST_NETPLAY_BAN_LIST: case DISPLAYLIST_NETPLAY_BAN_LIST:
#ifdef HAVE_NETWORKING #ifdef HAVE_NETWORKING
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
count = menu_displaylist_netplay_ban(info->list); count = menu_displaylist_netplay_ban(info->list);
#endif #endif
info->need_push = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_refresh = true; info->flags |= MD_FLAG_NEED_PUSH;
break; break;
case DISPLAYLIST_OPTIONS_REMAPPINGS_PORT: case DISPLAYLIST_OPTIONS_REMAPPINGS_PORT:
{ {
@ -11147,10 +11137,10 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
} }
} }
info->need_push = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_refresh = true; info->flags |= MD_FLAG_NEED_PUSH;
if (selection >= count) if (selection >= count)
info->need_clear = true; info->flags |= MD_FLAG_NEED_CLEAR;
} }
break; break;
#ifdef HAVE_CDROM #ifdef HAVE_CDROM
@ -11394,9 +11384,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY, MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY,
FILE_TYPE_NONE, 0, 0, NULL); FILE_TYPE_NONE, 0, 0, NULL);
info->need_push = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_refresh = true; info->flags |= MD_FLAG_NEED_PUSH;
info->need_clear = true; info->flags |= MD_FLAG_NEED_CLEAR;
break; break;
} }
case DISPLAYLIST_LOAD_DISC: case DISPLAYLIST_LOAD_DISC:
@ -11411,9 +11401,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY, MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY,
FILE_TYPE_NONE, 0, 0, NULL); FILE_TYPE_NONE, 0, 0, NULL);
info->need_push = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_refresh = true; info->flags |= MD_FLAG_NEED_PUSH;
info->need_clear = true; info->flags |= MD_FLAG_NEED_CLEAR;
break; break;
#else #else
case DISPLAYLIST_CDROM_DETAIL_INFO: case DISPLAYLIST_CDROM_DETAIL_INFO:
@ -11689,9 +11679,10 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
msg_hash_to_str(MENU_ENUM_LABEL_NO_ITEMS), msg_hash_to_str(MENU_ENUM_LABEL_NO_ITEMS),
MENU_ENUM_LABEL_NO_ITEMS, MENU_ENUM_LABEL_NO_ITEMS,
MENU_SETTING_NO_ITEM, 0, 0, NULL); MENU_SETTING_NO_ITEM, 0, 0, NULL);
info->need_push = true;
info->need_refresh = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_clear = true; info->flags |= MD_FLAG_NEED_PUSH;
info->flags |= MD_FLAG_NEED_CLEAR;
break; break;
case DISPLAYLIST_MIXER_STREAM_SETTINGS_LIST: case DISPLAYLIST_MIXER_STREAM_SETTINGS_LIST:
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
@ -11768,9 +11759,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY, MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY,
FILE_TYPE_NONE, 0, 0, NULL); FILE_TYPE_NONE, 0, 0, NULL);
info->need_push = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_refresh = true; info->flags |= MD_FLAG_NEED_PUSH;
info->need_clear = true; info->flags |= MD_FLAG_NEED_CLEAR;
break; break;
case DISPLAYLIST_NETPLAY_LAN_SCAN_SETTINGS_LIST: case DISPLAYLIST_NETPLAY_LAN_SCAN_SETTINGS_LIST:
/* TODO/FIXME ? */ /* TODO/FIXME ? */
@ -11780,7 +11771,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
break; break;
case DISPLAYLIST_NETPLAY: case DISPLAYLIST_NETPLAY:
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
/* TODO/FIXME ? */ /* TODO/FIXME ? */
break; break;
case DISPLAYLIST_INFORMATION: case DISPLAYLIST_INFORMATION:
@ -11796,8 +11787,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY, MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY,
FILE_TYPE_NONE, 0, 0, NULL); FILE_TYPE_NONE, 0, 0, NULL);
info->need_push = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_refresh = true; info->flags |= MD_FLAG_NEED_PUSH;
break; break;
case DISPLAYLIST_DATABASE_ENTRY: case DISPLAYLIST_DATABASE_ENTRY:
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
@ -11842,14 +11833,14 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
ret = menu_displaylist_parse_database_entry(menu, settings, ret = menu_displaylist_parse_database_entry(menu, settings,
info); info);
else else
info->need_push_no_playlist_entries = true; info->flags |= MD_FLAG_NEED_PUSH_NO_PLAYLIST_ENTRIES;
#else #else
ret = 0; ret = 0;
info->need_push_no_playlist_entries = true; info->need_push_no_playlist_entries = true;
#endif #endif
} }
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
break; break;
case DISPLAYLIST_DATABASE_QUERY: case DISPLAYLIST_DATABASE_QUERY:
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
@ -11885,9 +11876,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY, MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY,
FILE_TYPE_NONE, 0, 0, NULL); FILE_TYPE_NONE, 0, 0, NULL);
info->need_sort = true; info->flags |= MD_FLAG_NEED_SORT;
info->need_refresh = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
break; break;
case DISPLAYLIST_OPTIONS_SHADERS: case DISPLAYLIST_OPTIONS_SHADERS:
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
@ -12021,7 +12012,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY, MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY,
FILE_TYPE_NONE, 0, 0, NULL); FILE_TYPE_NONE, 0, 0, NULL);
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
break; break;
case DISPLAYLIST_CORE_CONTENT: case DISPLAYLIST_CORE_CONTENT:
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
@ -12037,9 +12028,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY, MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY,
FILE_TYPE_NONE, 0, 0, NULL); FILE_TYPE_NONE, 0, 0, NULL);
info->need_push = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_refresh = true; info->flags |= MD_FLAG_NEED_PUSH;
info->need_clear = true; info->flags |= MD_FLAG_NEED_CLEAR;
#endif #endif
break; break;
case DISPLAYLIST_CORE_CONTENT_DIRS_SUBDIR: case DISPLAYLIST_CORE_CONTENT_DIRS_SUBDIR:
@ -12068,9 +12059,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY, MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY,
FILE_TYPE_NONE, 0, 0, NULL); FILE_TYPE_NONE, 0, 0, NULL);
info->need_push = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_refresh = true; info->flags |= MD_FLAG_NEED_PUSH;
info->need_clear = true; info->flags |= MD_FLAG_NEED_CLEAR;
string_list_deinitialize(&str_list); string_list_deinitialize(&str_list);
#endif #endif
@ -12096,9 +12087,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY, MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY,
FILE_TYPE_NONE, 0, 0, NULL); FILE_TYPE_NONE, 0, 0, NULL);
info->need_push = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_refresh = true; info->flags |= MD_FLAG_NEED_PUSH;
info->need_clear = true; info->flags |= MD_FLAG_NEED_CLEAR;
#endif #endif
} }
break; break;
@ -12116,9 +12107,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY, MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY,
FILE_TYPE_NONE, 0, 0, NULL); FILE_TYPE_NONE, 0, 0, NULL);
info->need_push = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_refresh = true; info->flags |= MD_FLAG_NEED_PUSH;
info->need_clear = true; info->flags |= MD_FLAG_NEED_CLEAR;
#endif #endif
break; break;
case DISPLAYLIST_CORES_UPDATER: case DISPLAYLIST_CORES_UPDATER:
@ -12191,7 +12182,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
} }
if (selection >= count) if (selection >= count)
info->need_clear = true; info->flags |= MD_FLAG_NEED_CLEAR;
} }
#endif #endif
if (count == 0) if (count == 0)
@ -12201,9 +12192,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY, MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY,
FILE_TYPE_NONE, 0, 0, NULL); FILE_TYPE_NONE, 0, 0, NULL);
info->need_push = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_refresh = true; info->flags |= MD_FLAG_NEED_PUSH;
break; break;
case DISPLAYLIST_THUMBNAILS_UPDATER: case DISPLAYLIST_THUMBNAILS_UPDATER:
#ifdef HAVE_NETWORKING #ifdef HAVE_NETWORKING
@ -12219,9 +12209,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY, MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY,
FILE_TYPE_NONE, 0, 0, NULL); FILE_TYPE_NONE, 0, 0, NULL);
info->need_push = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_refresh = true; info->flags |= MD_FLAG_NEED_PUSH;
info->need_clear = true; info->flags |= MD_FLAG_NEED_CLEAR;
#endif #endif
break; break;
case DISPLAYLIST_PL_THUMBNAILS_UPDATER: case DISPLAYLIST_PL_THUMBNAILS_UPDATER:
@ -12237,9 +12227,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY, MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY,
FILE_TYPE_NONE, 0, 0, NULL); FILE_TYPE_NONE, 0, 0, NULL);
info->need_push = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_refresh = true; info->flags |= MD_FLAG_NEED_PUSH;
info->need_clear = true; info->flags |= MD_FLAG_NEED_CLEAR;
#endif #endif
break; break;
case DISPLAYLIST_LAKKA: case DISPLAYLIST_LAKKA:
@ -12256,9 +12246,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY, MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY,
FILE_TYPE_NONE, 0, 0, NULL); FILE_TYPE_NONE, 0, 0, NULL);
info->need_push = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_refresh = true; info->flags |= MD_FLAG_NEED_PUSH;
info->need_clear = true; info->flags |= MD_FLAG_NEED_CLEAR;
#endif #endif
break; break;
case DISPLAYLIST_PLAYLIST_COLLECTION: case DISPLAYLIST_PLAYLIST_COLLECTION:
@ -12314,9 +12304,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
/* Playlists themselves are sorted /* Playlists themselves are sorted
* > Display lists generated from playlists * > Display lists generated from playlists
* must never be sorted */ * must never be sorted */
info->need_sort = false; info->flags &= ~MD_FLAG_NEED_SORT;
info->need_refresh = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
} }
} }
break; break;
@ -12347,11 +12337,11 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
/* Playlists themselves are sorted /* Playlists themselves are sorted
* > Display lists generated from playlists * > Display lists generated from playlists
* must never be sorted */ * must never be sorted */
info->need_sort = false; info->flags &= ~MD_FLAG_NEED_SORT;
info->need_refresh = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
info->need_navigation_clear = if (history_needs_navigation_clear(menu, g_defaults.content_history))
history_needs_navigation_clear(menu, g_defaults.content_history); info->flags |= MD_FLAG_NEED_NAVIGATION_CLEAR;
break; break;
case DISPLAYLIST_FAVORITES: case DISPLAYLIST_FAVORITES:
{ {
@ -12375,17 +12365,17 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
msg_hash_to_str(MENU_ENUM_LABEL_NO_FAVORITES_AVAILABLE), msg_hash_to_str(MENU_ENUM_LABEL_NO_FAVORITES_AVAILABLE),
MENU_ENUM_LABEL_NO_FAVORITES_AVAILABLE, MENU_ENUM_LABEL_NO_FAVORITES_AVAILABLE,
MENU_INFO_MESSAGE, 0, 0, NULL); MENU_INFO_MESSAGE, 0, 0, NULL);
info->need_push_no_playlist_entries = false; info->flags &= ~MD_FLAG_NEED_PUSH_NO_PLAYLIST_ENTRIES;
ret = 0; ret = 0;
} }
ret = 0; ret = 0;
/* Playlists themselves are sorted /* Playlists themselves are sorted
* > Display lists generated from playlists * > Display lists generated from playlists
* must never be sorted */ * must never be sorted */
info->need_sort = false; info->flags &= ~MD_FLAG_NEED_SORT;
info->need_refresh = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
} }
break; break;
case DISPLAYLIST_MUSIC_HISTORY: case DISPLAYLIST_MUSIC_HISTORY:
@ -12412,8 +12402,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
msg_hash_to_str(MENU_ENUM_LABEL_NO_MUSIC_AVAILABLE), msg_hash_to_str(MENU_ENUM_LABEL_NO_MUSIC_AVAILABLE),
MENU_ENUM_LABEL_NO_MUSIC_AVAILABLE, MENU_ENUM_LABEL_NO_MUSIC_AVAILABLE,
MENU_INFO_MESSAGE, 0, 0, NULL); MENU_INFO_MESSAGE, 0, 0, NULL);
info->need_push_no_playlist_entries = false; info->flags &= ~MD_FLAG_NEED_PUSH_NO_PLAYLIST_ENTRIES;
ret = 0; ret = 0;
} }
} }
@ -12422,11 +12412,11 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
/* Playlists themselves are sorted /* Playlists themselves are sorted
* > Display lists generated from playlists * > Display lists generated from playlists
* must never be sorted */ * must never be sorted */
info->need_sort = false; info->flags &= ~MD_FLAG_NEED_SORT;
info->need_refresh = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
info->need_navigation_clear = if (history_needs_navigation_clear(menu, g_defaults.music_history))
history_needs_navigation_clear(menu, g_defaults.music_history); info->flags |= MD_FLAG_NEED_NAVIGATION_CLEAR;
} }
break; break;
case DISPLAYLIST_VIDEO_HISTORY: case DISPLAYLIST_VIDEO_HISTORY:
@ -12460,8 +12450,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
msg_hash_to_str(MENU_ENUM_LABEL_NO_VIDEOS_AVAILABLE), msg_hash_to_str(MENU_ENUM_LABEL_NO_VIDEOS_AVAILABLE),
MENU_ENUM_LABEL_NO_VIDEOS_AVAILABLE, MENU_ENUM_LABEL_NO_VIDEOS_AVAILABLE,
MENU_INFO_MESSAGE, 0, 0, NULL); MENU_INFO_MESSAGE, 0, 0, NULL);
info->need_push_no_playlist_entries = false; info->flags &= ~MD_FLAG_NEED_PUSH_NO_PLAYLIST_ENTRIES;
ret = 0; ret = 0;
} }
if (ret == 0) if (ret == 0)
@ -12469,12 +12459,12 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
/* Playlists themselves are sorted /* Playlists themselves are sorted
* > Display lists generated from playlists * > Display lists generated from playlists
* must never be sorted */ * must never be sorted */
info->need_sort = false; info->flags &= ~MD_FLAG_NEED_SORT;
info->need_refresh = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
#if (defined(HAVE_FFMPEG) || defined(HAVE_MPV)) #if (defined(HAVE_FFMPEG) || defined(HAVE_MPV))
info->need_navigation_clear = if (history_needs_navigation_clear(menu, g_defaults.video_history))
history_needs_navigation_clear(menu, g_defaults.video_history); info->flags |= MD_FLAG_NEED_NAVIGATION_CLEAR;
#endif #endif
} }
break; break;
@ -12483,16 +12473,16 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
rcheevos_menu_populate_hardcore_pause_submenu(info); rcheevos_menu_populate_hardcore_pause_submenu(info);
#endif #endif
info->need_push = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_refresh = true; info->flags |= MD_FLAG_NEED_PUSH;
break; break;
case DISPLAYLIST_ACHIEVEMENT_LIST: case DISPLAYLIST_ACHIEVEMENT_LIST:
#ifdef HAVE_CHEEVOS #ifdef HAVE_CHEEVOS
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
rcheevos_menu_populate(info); rcheevos_menu_populate(info);
#endif #endif
info->need_push = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_refresh = true; info->flags |= MD_FLAG_NEED_PUSH;
break; break;
case DISPLAYLIST_CORES_SUPPORTED: case DISPLAYLIST_CORES_SUPPORTED:
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
@ -12502,9 +12492,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
MENU_ENUM_LABEL_DETECT_CORE_LIST_OK, MENU_ENUM_LABEL_DETECT_CORE_LIST_OK,
MENU_ENUM_LABEL_DETECT_CORE_LIST_OK_CURRENT_CORE); MENU_ENUM_LABEL_DETECT_CORE_LIST_OK_CURRENT_CORE);
info->need_sort = false; info->flags &= ~MD_FLAG_NEED_SORT;
info->need_refresh = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
break; break;
case DISPLAYLIST_CORES_COLLECTION_SUPPORTED: case DISPLAYLIST_CORES_COLLECTION_SUPPORTED:
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
@ -12514,9 +12504,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
MENU_ENUM_LABEL_FILE_BROWSER_CORE_SELECT_FROM_COLLECTION, MENU_ENUM_LABEL_FILE_BROWSER_CORE_SELECT_FROM_COLLECTION,
MENU_ENUM_LABEL_FILE_BROWSER_CORE_SELECT_FROM_COLLECTION_CURRENT_CORE); MENU_ENUM_LABEL_FILE_BROWSER_CORE_SELECT_FROM_COLLECTION_CURRENT_CORE);
info->need_sort = false; info->flags &= ~MD_FLAG_NEED_SORT;
info->need_refresh = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
core_selected = true; core_selected = true;
break; break;
case DISPLAYLIST_CORE_INFO: case DISPLAYLIST_CORE_INFO:
@ -12541,10 +12531,10 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
if (selection >= count) if (selection >= count)
{ {
info->need_refresh = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_navigation_clear = true; info->flags |= MD_FLAG_NEED_NAVIGATION_CLEAR;
} }
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
} }
break; break;
case DISPLAYLIST_CORE_RESTORE_BACKUP_LIST: case DISPLAYLIST_CORE_RESTORE_BACKUP_LIST:
@ -12553,8 +12543,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
count = menu_displaylist_parse_core_backup_list( count = menu_displaylist_parse_core_backup_list(
info, settings, true); info, settings, true);
} }
info->need_refresh = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
break; break;
case DISPLAYLIST_CORE_DELETE_BACKUP_LIST: case DISPLAYLIST_CORE_DELETE_BACKUP_LIST:
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
@ -12562,9 +12552,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
count = menu_displaylist_parse_core_backup_list( count = menu_displaylist_parse_core_backup_list(
info, settings, false); info, settings, false);
} }
info->need_navigation_clear = true; info->flags |= MD_FLAG_NEED_NAVIGATION_CLEAR;
info->need_refresh = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
break; break;
case DISPLAYLIST_CORE_MANAGER_LIST: case DISPLAYLIST_CORE_MANAGER_LIST:
{ {
@ -12589,11 +12579,11 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
if ((count != prev_count) || if ((count != prev_count) ||
(selection >= count)) (selection >= count))
{ {
info->need_refresh = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_navigation_clear = true; info->flags |= MD_FLAG_NEED_NAVIGATION_CLEAR;
prev_count = count; prev_count = count;
} }
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
} }
break; break;
#ifdef HAVE_MIST #ifdef HAVE_MIST
@ -12652,8 +12642,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
if (contentless_core_ptr < count) if (contentless_core_ptr < count)
menu_navigation_set_selection(contentless_core_ptr); menu_navigation_set_selection(contentless_core_ptr);
info->need_sort = false; info->flags &= ~MD_FLAG_NEED_SORT;
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
} }
break; break;
case DISPLAYLIST_SAVESTATE_LIST: case DISPLAYLIST_SAVESTATE_LIST:
@ -12715,7 +12705,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY, MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY,
FILE_TYPE_NONE, 0, 0, NULL); FILE_TYPE_NONE, 0, 0, NULL);
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
} }
break; break;
case DISPLAYLIST_CORE_OPTIONS: case DISPLAYLIST_CORE_OPTIONS:
@ -12827,10 +12817,10 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
if (selection >= count) if (selection >= count)
{ {
info->need_refresh = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_navigation_clear = true; info->flags |= MD_FLAG_NEED_NAVIGATION_CLEAR;
} }
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
} }
break; break;
case DISPLAYLIST_CORE_OPTION_OVERRIDE_LIST: case DISPLAYLIST_CORE_OPTION_OVERRIDE_LIST:
@ -12850,10 +12840,10 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
if (selection >= count) if (selection >= count)
{ {
info->need_refresh = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_navigation_clear = true; info->flags |= MD_FLAG_NEED_NAVIGATION_CLEAR;
} }
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
} }
break; break;
case DISPLAYLIST_REMAP_FILE_MANAGER: case DISPLAYLIST_REMAP_FILE_MANAGER:
@ -12873,10 +12863,10 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
if (selection >= count) if (selection >= count)
{ {
info->need_refresh = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_navigation_clear = true; info->flags |= MD_FLAG_NEED_NAVIGATION_CLEAR;
} }
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
} }
break; break;
case DISPLAYLIST_ARCHIVE_ACTION: case DISPLAYLIST_ARCHIVE_ACTION:
@ -12896,7 +12886,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
0, 0, 0, NULL)) 0, 0, 0, NULL))
count++; count++;
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
break; break;
case DISPLAYLIST_ARCHIVE_ACTION_DETECT_CORE: case DISPLAYLIST_ARCHIVE_ACTION_DETECT_CORE:
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
@ -12915,9 +12905,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
0, 0, 0, NULL)) 0, 0, 0, NULL))
count++; count++;
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
break; break;
case DISPLAYLIST_PLAYLIST_MANAGER_LIST: case DISPLAYLIST_PLAYLIST_MANAGER_LIST:
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
count = menu_displaylist_parse_playlist_manager_list(info, settings); count = menu_displaylist_parse_playlist_manager_list(info, settings);
@ -12929,8 +12918,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY, MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY,
FILE_TYPE_NONE, 0, 0, NULL); FILE_TYPE_NONE, 0, 0, NULL);
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
break; break;
case DISPLAYLIST_PLAYLIST_MANAGER_SETTINGS: case DISPLAYLIST_PLAYLIST_MANAGER_SETTINGS:
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
@ -12943,8 +12931,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY, MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY,
FILE_TYPE_NONE, 0, 0, NULL); FILE_TYPE_NONE, 0, 0, NULL);
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
break; break;
case DISPLAYLIST_DROPDOWN_LIST_VIDEO_SHADER_PARAMETER: case DISPLAYLIST_DROPDOWN_LIST_VIDEO_SHADER_PARAMETER:
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
@ -12954,49 +12941,49 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
MENU_SETTINGS_SHADER_PARAMETER_0, MENU_SETTINGS_SHADER_PARAMETER_0,
MENU_SETTING_DROPDOWN_ITEM_VIDEO_SHADER_PARAM); MENU_SETTING_DROPDOWN_ITEM_VIDEO_SHADER_PARAM);
info->need_refresh = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
break; break;
case DISPLAYLIST_DROPDOWN_LIST_VIDEO_SHADER_PRESET_PARAMETER: case DISPLAYLIST_DROPDOWN_LIST_VIDEO_SHADER_PRESET_PARAMETER:
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
count = menu_displaylist_build_shader_parameter( count = menu_displaylist_build_shader_parameter(
info, info->list, info->type, info, info->list, info->type,
MENU_SETTINGS_SHADER_PRESET_PARAMETER_0, MENU_SETTINGS_SHADER_PRESET_PARAMETER_0,
MENU_SETTING_DROPDOWN_ITEM_VIDEO_SHADER_PRESET_PARAM); MENU_SETTING_DROPDOWN_ITEM_VIDEO_SHADER_PRESET_PARAM);
info->need_refresh = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
break; break;
case DISPLAYLIST_DROPDOWN_LIST_INPUT_DEVICE_TYPE: case DISPLAYLIST_DROPDOWN_LIST_INPUT_DEVICE_TYPE:
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
count = menu_displaylist_parse_input_device_type_list(info, settings); count = menu_displaylist_parse_input_device_type_list(info, settings);
info->need_refresh = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
break; break;
case DISPLAYLIST_DROPDOWN_LIST_INPUT_DEVICE_INDEX: case DISPLAYLIST_DROPDOWN_LIST_INPUT_DEVICE_INDEX:
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
count = menu_displaylist_parse_input_device_index_list(info, settings); count = menu_displaylist_parse_input_device_index_list(info, settings);
info->need_refresh = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
break; break;
case DISPLAYLIST_DROPDOWN_LIST_INPUT_DESCRIPTION: case DISPLAYLIST_DROPDOWN_LIST_INPUT_DESCRIPTION:
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
count = menu_displaylist_parse_input_description_list(info, settings); count = menu_displaylist_parse_input_description_list(info, settings);
info->need_refresh = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
break; break;
case DISPLAYLIST_DROPDOWN_LIST_INPUT_DESCRIPTION_KBD: case DISPLAYLIST_DROPDOWN_LIST_INPUT_DESCRIPTION_KBD:
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
count = menu_displaylist_parse_input_description_kbd_list(info, settings); count = menu_displaylist_parse_input_description_kbd_list(info, settings);
info->need_refresh = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
break; break;
#ifdef HAVE_NETWORKING #ifdef HAVE_NETWORKING
case DISPLAYLIST_DROPDOWN_LIST_NETPLAY_MITM_SERVER: case DISPLAYLIST_DROPDOWN_LIST_NETPLAY_MITM_SERVER:
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
count = menu_displaylist_parse_netplay_mitm_server_list(info, settings); count = menu_displaylist_parse_netplay_mitm_server_list(info, settings);
info->need_refresh = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
break; break;
#endif #endif
case DISPLAYLIST_SAVING_SETTINGS_LIST: case DISPLAYLIST_SAVING_SETTINGS_LIST:
@ -13184,6 +13171,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
} }
} }
info->flags |= MD_FLAG_NEED_REFRESH;
info->flags |= MD_FLAG_NEED_PUSH;
/* Special pass */ /* Special pass */
switch (type) switch (type)
{ {
@ -13192,14 +13182,11 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
#ifdef HAVE_LAKKA #ifdef HAVE_LAKKA
case DISPLAYLIST_EJECT_DISC: case DISPLAYLIST_EJECT_DISC:
#endif #endif
info->need_clear = true; info->flags |= MD_FLAG_NEED_CLEAR;
break; break;
default: default:
break; break;
} }
info->need_refresh = true;
info->need_push = true;
break; break;
case DISPLAYLIST_HORIZONTAL: case DISPLAYLIST_HORIZONTAL:
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
@ -13208,23 +13195,22 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
/* Playlists themselves are sorted /* Playlists themselves are sorted
* > Display lists generated from playlists * > Display lists generated from playlists
* must never be sorted */ * must never be sorted */
info->need_sort = false; info->flags &= ~MD_FLAG_NEED_SORT;
info->need_refresh = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
break; break;
case DISPLAYLIST_HORIZONTAL_CONTENT_ACTIONS: case DISPLAYLIST_HORIZONTAL_CONTENT_ACTIONS:
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
ret = menu_displaylist_parse_horizontal_content_actions(menu, ret = menu_displaylist_parse_horizontal_content_actions
settings, info); (menu, settings, info);
info->need_refresh = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
if (core_selected) if (core_selected)
{ {
info->need_clear = true; info->flags |= MD_FLAG_NEED_CLEAR;
core_selected = false; core_selected = false;
} }
break; break;
case DISPLAYLIST_OPTIONS: case DISPLAYLIST_OPTIONS:
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
@ -13441,7 +13427,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
MENU_SETTING_NO_ITEM, 0, 0, NULL); MENU_SETTING_NO_ITEM, 0, 0, NULL);
ret = 0; ret = 0;
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
break; break;
case DISPLAYLIST_OPTIONS_OVERRIDES: case DISPLAYLIST_OPTIONS_OVERRIDES:
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
@ -13491,7 +13477,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
MENU_ENUM_LABEL_NO_SETTINGS_FOUND, MENU_ENUM_LABEL_NO_SETTINGS_FOUND,
0, 0, 0, NULL); 0, 0, 0, NULL);
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
break; break;
case DISPLAYLIST_SHADER_PARAMETERS: case DISPLAYLIST_SHADER_PARAMETERS:
case DISPLAYLIST_SHADER_PARAMETERS_PRESET: case DISPLAYLIST_SHADER_PARAMETERS_PRESET:
@ -13526,8 +13512,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
0, 0, 0, NULL); 0, 0, 0, NULL);
ret = 0; ret = 0;
info->need_refresh = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
break; break;
case DISPLAYLIST_MAIN_MENU: case DISPLAYLIST_MAIN_MENU:
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
@ -13711,7 +13697,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
PARSE_ACTION, false) == 0) PARSE_ACTION, false) == 0)
count++; count++;
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
} }
break; break;
case DISPLAYLIST_HELP: case DISPLAYLIST_HELP:
@ -13733,7 +13719,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
case DISPLAYLIST_FILE_BROWSER_SELECT_CORE: case DISPLAYLIST_FILE_BROWSER_SELECT_CORE:
case DISPLAYLIST_FILE_BROWSER_SELECT_COLLECTION: case DISPLAYLIST_FILE_BROWSER_SELECT_COLLECTION:
case DISPLAYLIST_GENERIC: case DISPLAYLIST_GENERIC:
info->need_navigation_clear = true; info->flags |= MD_FLAG_NEED_NAVIGATION_CLEAR;
/* fall-through */ /* fall-through */
case DISPLAYLIST_PENDING_CLEAR: case DISPLAYLIST_PENDING_CLEAR:
{ {
@ -13749,7 +13735,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
NULL)) NULL))
count++; count++;
info->need_entries_refresh = true; info->flags |= MD_FLAG_NEED_ENTRIES_REFRESH;
} }
break; break;
case DISPLAYLIST_USER_BINDS_LIST: case DISPLAYLIST_USER_BINDS_LIST:
@ -13760,10 +13746,10 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
const char *temp_val = msg_hash_to_str( const char *temp_val = msg_hash_to_str(
(enum msg_hash_enums)(MENU_ENUM_LABEL_INPUT_USER_1_BINDS + (val-1))); (enum msg_hash_enums)(MENU_ENUM_LABEL_INPUT_USER_1_BINDS + (val-1)));
strlcpy(lbl, temp_val, sizeof(lbl)); strlcpy(lbl, temp_val, sizeof(lbl));
ret = MENU_DISPLAYLIST_PARSE_SETTINGS(info->list, ret = MENU_DISPLAYLIST_PARSE_SETTINGS(info->list,
lbl, PARSE_NONE, true, MENU_SETTINGS_INPUT_BEGIN); lbl, PARSE_NONE, true, MENU_SETTINGS_INPUT_BEGIN);
info->need_refresh = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
} }
break; break;
case DISPLAYLIST_DATABASES: case DISPLAYLIST_DATABASES:
@ -13903,9 +13889,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
/* Playlists themselves are sorted /* Playlists themselves are sorted
* > Display lists generated from playlists * > Display lists generated from playlists
* must never be sorted */ * must never be sorted */
info->need_sort = false; info->flags &= ~MD_FLAG_NEED_SORT;
info->need_refresh = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
} }
break; break;
case DISPLAYLIST_IMAGES_HISTORY: case DISPLAYLIST_IMAGES_HISTORY:
@ -13936,22 +13922,21 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
msg_hash_to_str(MENU_ENUM_LABEL_NO_IMAGES_AVAILABLE), msg_hash_to_str(MENU_ENUM_LABEL_NO_IMAGES_AVAILABLE),
MENU_ENUM_LABEL_NO_IMAGES_AVAILABLE, MENU_ENUM_LABEL_NO_IMAGES_AVAILABLE,
MENU_INFO_MESSAGE, 0, 0, NULL); MENU_INFO_MESSAGE, 0, 0, NULL);
info->need_push_no_playlist_entries = false; info->flags &= ~MD_FLAG_NEED_PUSH_NO_PLAYLIST_ENTRIES;
ret = 0; ret = 0;
} }
ret = 0; ret = 0;
/* Playlists themselves are sorted /* Playlists themselves are sorted
* > Display lists generated from playlists * > Display lists generated from playlists
* must never be sorted */ * must never be sorted */
info->need_sort = false; info->flags &= ~MD_FLAG_NEED_SORT;
info->need_refresh = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
#if defined(HAVE_IMAGEVIEWER) #if defined(HAVE_IMAGEVIEWER)
info->need_navigation_clear = if (history_needs_navigation_clear(menu, g_defaults.image_history))
history_needs_navigation_clear(menu, g_defaults.image_history); info->flags |= MD_FLAG_NEED_NAVIGATION_CLEAR;
#endif #endif
break; break;
case DISPLAYLIST_VIDEO_FILTERS: case DISPLAYLIST_VIDEO_FILTERS:
case DISPLAYLIST_CONFIG_FILES: case DISPLAYLIST_CONFIG_FILES:
@ -14082,8 +14067,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
MENU_ENUM_LABEL_NO_PLAYLISTS, MENU_ENUM_LABEL_NO_PLAYLISTS,
MENU_SETTING_NO_ITEM, 0, 0, NULL); MENU_SETTING_NO_ITEM, 0, 0, NULL);
info->need_refresh = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
} }
break; break;
case DISPLAYLIST_CORES: case DISPLAYLIST_CORES:
@ -14113,11 +14098,11 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
MENU_ENUM_LABEL_NO_ITEMS, MENU_ENUM_LABEL_NO_ITEMS,
MENU_SETTING_NO_ITEM, 0, 0, NULL); MENU_SETTING_NO_ITEM, 0, 0, NULL);
info->need_refresh = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
if (string_is_equal(info->label, if (string_is_equal(info->label,
msg_hash_to_str(MENU_ENUM_LABEL_CORE_LIST))) msg_hash_to_str(MENU_ENUM_LABEL_CORE_LIST)))
info->push_builtin_cores = true; info->flags |= MD_FLAG_PUSH_BUILTIN_CORES;
break; break;
case DISPLAYLIST_DEFAULT: case DISPLAYLIST_DEFAULT:
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
@ -14138,7 +14123,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY, MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY,
FILE_TYPE_NONE, 0, 0, NULL); FILE_TYPE_NONE, 0, 0, NULL);
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
break; break;
case DISPLAYLIST_DROPDOWN_LIST: case DISPLAYLIST_DROPDOWN_LIST:
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
@ -14456,8 +14441,8 @@ setting->max : 9999.00f;
} }
} }
info->need_refresh = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
} }
break; break;
case DISPLAYLIST_DROPDOWN_LIST_VIDEO_SHADER_NUM_PASSES: case DISPLAYLIST_DROPDOWN_LIST_VIDEO_SHADER_NUM_PASSES:
@ -14490,8 +14475,8 @@ setting->max : 9999.00f;
} }
} }
info->need_refresh = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
} }
#endif #endif
break; break;
@ -14787,8 +14772,8 @@ setting->max : 9999.00f;
} }
} }
info->need_refresh = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
break; break;
case DISPLAYLIST_NONE: case DISPLAYLIST_NONE:
break; break;
@ -14836,8 +14821,8 @@ setting->max : 9999.00f;
} }
} }
info->need_refresh = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
} }
if (ret != 0) if (ret != 0)

37
menu/menu_displaylist.h
View File

@ -296,6 +296,24 @@ enum filebrowser_enums
FILEBROWSER_SELECT_COLLECTION FILEBROWSER_SELECT_COLLECTION
}; };
enum menu_dl_flags
{
MD_FLAG_NONE = 0,
MD_FLAG_NEED_SORT = (1 << 0), /* Should the displaylist be sorted by alphabet? */
MD_FLAG_NEED_REFRESH = (1 << 1),
MD_FLAG_NEED_ENTRIES_REFRESH = (1 << 2),
MD_FLAG_NEED_PUSH = (1 << 3),
MD_FLAG_NEED_PUSH_NO_PLAYLIST_ENTRIES = (1 << 4),
MD_FLAG_NEED_CLEAR = (1 << 5), /* Should we clear the displaylist before we push
* entries onto it? */
MD_FLAG_PUSH_BUILTIN_CORES = (1 << 6),
MD_FLAG_DOWNLOAD_CORE = (1 << 7), /* Should a 'download core' entry be pushed onto the list?
* This will be set to true in case there are no currently
* installed cores. */
MD_FLAG_NEED_NAVIGATION_CLEAR = (1 << 8) /* Does the navigation index need to be cleared
* to 0 (first entry) ? */
};
typedef struct menu_displaylist_info typedef struct menu_displaylist_info
{ {
char *path; char *path;
@ -309,29 +327,12 @@ typedef struct menu_displaylist_info
size_t directory_ptr; size_t directory_ptr;
uint32_t flags;
unsigned count; unsigned count;
unsigned type; unsigned type;
unsigned type_default; unsigned type_default;
unsigned flags;
enum msg_hash_enums enum_idx; enum msg_hash_enums enum_idx;
/* should the displaylist be sorted by alphabet? */
bool need_sort;
bool need_refresh;
bool need_entries_refresh;
bool need_push;
bool need_push_no_playlist_entries;
/* should we clear the displaylist before we push
* entries onto it? */
bool need_clear;
bool push_builtin_cores;
/* Should a 'download core' entry be pushed onto the list?
* This will be set to true in case there are no currently
* installed cores. */
bool download_core;
/* does the navigation index need to be cleared to 0 (first entry) ? */
bool need_navigation_clear;
} menu_displaylist_info_t; } menu_displaylist_info_t;
#define MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, label, parse_type, add_empty_entry) menu_displaylist_parse_settings_enum(list, parse_type, add_empty_entry, menu_setting_find_enum(label), label, true) #define MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, label, parse_type, add_empty_entry) menu_displaylist_parse_settings_enum(list, parse_type, add_empty_entry, menu_setting_find_enum(label), label, true)

8
menu/menu_driver.c
View File

@ -2340,7 +2340,7 @@ static bool menu_driver_displaylist_push_internal(
MENU_ENUM_LABEL_TAKE_SCREENSHOT, MENU_ENUM_LABEL_TAKE_SCREENSHOT,
MENU_SETTING_ACTION_SCREENSHOT, 0, 0, NULL); MENU_SETTING_ACTION_SCREENSHOT, 0, 0, NULL);
else else
info->need_push_no_playlist_entries = true; info->flags |= MD_FLAG_NEED_PUSH_NO_PLAYLIST_ENTRIES;
#endif #endif
#endif #endif
menu_displaylist_ctl(DISPLAYLIST_IMAGES_HISTORY, info, settings); menu_displaylist_ctl(DISPLAYLIST_IMAGES_HISTORY, info, settings);
@ -2365,9 +2365,9 @@ static bool menu_driver_displaylist_push_internal(
if (string_is_empty(dir_playlist)) if (string_is_empty(dir_playlist))
{ {
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
info->need_refresh = true; info->flags |= MD_FLAG_NEED_REFRESH;
info->need_push_no_playlist_entries = true; info->flags |= MD_FLAG_NEED_PUSH_NO_PLAYLIST_ENTRIES;
info->need_push = true; info->flags |= MD_FLAG_NEED_PUSH;
return true; return true;
} }