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

(menu_displaylist.c) Cleanups

Browse Source
This commit is contained in:
twinaphex 2015-06-05 17:53:36 +02:00
parent 11b7b421e6
commit 6f1e5a81be
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
menu/menu_displaylist.c
View File

@ -2076,7 +2076,7 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type)
return ret; return ret;
} }
static int menu_displaylist_deferred_push(menu_displaylist_info_t *info) static int menu_displaylist_deferred_push(menu_displaylist_info_t *info, uint32_t hash_label)
{ {
menu_file_list_cbs_t *cbs = NULL; menu_file_list_cbs_t *cbs = NULL;
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
@ -2084,14 +2084,13 @@ static int menu_displaylist_deferred_push(menu_displaylist_info_t *info)
if (!info->list) if (!info->list)
return -1; return -1;
if (!strcmp(info->label, "Main Menu")) switch (hash_label)
{ {
info->flags = SL_FLAG_MAIN_MENU; case MENU_VALUE_MAIN_MENU:
return menu_displaylist_push_list(info, DISPLAYLIST_MAIN_MENU); info->flags = SL_FLAG_MAIN_MENU;
} return menu_displaylist_push_list(info, DISPLAYLIST_MAIN_MENU);
else if (!strcmp(info->label, "Horizontal Menu")) case MENU_VALUE_HORIZONTAL_MENU:
{ return menu_displaylist_push_list(info, DISPLAYLIST_HORIZONTAL);
return menu_displaylist_push_list(info, DISPLAYLIST_HORIZONTAL);
} }
cbs = (menu_file_list_cbs_t*) cbs = (menu_file_list_cbs_t*)
@ -2110,6 +2109,7 @@ int menu_displaylist_push(file_list_t *list, file_list_t *menu_list)
const char *label = NULL; const char *label = NULL;
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
menu_displaylist_info_t info = {0}; menu_displaylist_info_t info = {0};
uint32_t hash_value = djb2_calculate(label);
menu_list_get_last_stack(menu->menu_list, &path, &label, &type); menu_list_get_last_stack(menu->menu_list, &path, &label, &type);
@ -2119,7 +2119,7 @@ int menu_displaylist_push(file_list_t *list, file_list_t *menu_list)
strlcpy(info.path, path, sizeof(info.path)); strlcpy(info.path, path, sizeof(info.path));
strlcpy(info.label, label, sizeof(info.label)); strlcpy(info.label, label, sizeof(info.label));
return menu_displaylist_deferred_push(&info); return menu_displaylist_deferred_push(&info, hash_value);
} }
/** /**