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

menu_displaylist_parse_playlist - cleanups

Browse Source
This commit is contained in:
twinaphex 2019-04-23 23:50:30 +02:00
parent 70d0bd5092
commit e7cb5ccdee
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
menu/menu_displaylist.c
View File

@ -811,11 +811,12 @@ static int menu_displaylist_parse_playlist(menu_displaylist_info_t *info,
{ {
unsigned i; unsigned i;
char label_spacer[PL_LABEL_SPACER_MAXLEN]; char label_spacer[PL_LABEL_SPACER_MAXLEN];
size_t list_size = playlist_size(playlist); size_t list_size = playlist_size(playlist);
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
bool is_rgui = string_is_equal(settings->arrays.menu_driver, "rgui"); bool is_rgui = string_is_equal(settings->arrays.menu_driver, "rgui");
bool get_runtime = false; bool get_runtime = false;
bool show_inline_core_name = false; bool show_inline_core_name = false;
unsigned pl_sublabel_runtime_type = settings->uints.playlist_sublabel_runtime_type;
label_spacer[0] = '\0'; label_spacer[0] = '\0';
@ -823,9 +824,9 @@ static int menu_displaylist_parse_playlist(menu_displaylist_info_t *info,
goto error; goto error;
/* Check whether runtime logging info should be parsed */ /* Check whether runtime logging info should be parsed */
if (((settings->uints.playlist_sublabel_runtime_type == PLAYLIST_RUNTIME_PER_CORE) && if (((pl_sublabel_runtime_type == PLAYLIST_RUNTIME_PER_CORE) &&
settings->bools.content_runtime_log) || settings->bools.content_runtime_log) ||
((settings->uints.playlist_sublabel_runtime_type == PLAYLIST_RUNTIME_AGGREGATE) && ((pl_sublabel_runtime_type == PLAYLIST_RUNTIME_AGGREGATE) &&
settings->bools.content_runtime_log_aggregate)) settings->bools.content_runtime_log_aggregate))
{ {
/* Runtime logging is valid for every type of playlist *apart from* /* Runtime logging is valid for every type of playlist *apart from*
@ -893,9 +894,8 @@ static int menu_displaylist_parse_playlist(menu_displaylist_info_t *info,
/* Extract any available runtime values, if required */ /* Extract any available runtime values, if required */
if (get_runtime) if (get_runtime)
{ {
runtime_log_t *runtime_log = NULL; runtime_log_t *runtime_log = runtime_log_init(entry->path, entry->core_path,
runtime_log = runtime_log_init(entry->path, entry->core_path, pl_sublabel_runtime_type == PLAYLIST_RUNTIME_PER_CORE);
settings->uints.playlist_sublabel_runtime_type == PLAYLIST_RUNTIME_PER_CORE);
if (runtime_log) if (runtime_log)
{ {
@ -3303,14 +3303,14 @@ static void menu_displaylist_parse_playlist_generic(
playlist = playlist_get_cached(); playlist = playlist_get_cached();
if (playlist) if (!playlist)
{ return;
if (sort)
playlist_qsort(playlist);
*ret = menu_displaylist_parse_playlist(info, if (sort)
playlist, playlist_name, is_collection); playlist_qsort(playlist);
}
*ret = menu_displaylist_parse_playlist(info,
playlist, playlist_name, is_collection);
} }
#ifdef HAVE_NETWORKING #ifdef HAVE_NETWORKING