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

Cleanups

Browse Source
This commit is contained in:
twinaphex 2016-07-02 20:49:38 +02:00
parent 3c81b2597d
commit 97de8a35ec
3 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
menu/cbs/menu_cbs_deferred_push.c
View File

@ -271,11 +271,6 @@ static int deferred_push_settings(menu_displaylist_info_t *info)
return deferred_push_dlist(info, DISPLAYLIST_SETTINGS_ALL); return deferred_push_dlist(info, DISPLAYLIST_SETTINGS_ALL);
} }
static int deferred_push_category(menu_displaylist_info_t *info)
{
return deferred_push_dlist(info, DISPLAYLIST_SETTINGS);
}
static int deferred_push_shader_options(menu_displaylist_info_t *info) static int deferred_push_shader_options(menu_displaylist_info_t *info)
{ {
return deferred_push_dlist(info, DISPLAYLIST_OPTIONS_SHADERS); return deferred_push_dlist(info, DISPLAYLIST_OPTIONS_SHADERS);
@ -1279,11 +1274,7 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
static int menu_cbs_init_bind_deferred_push_compare_type( static int menu_cbs_init_bind_deferred_push_compare_type(
menu_file_list_cbs_t *cbs, unsigned type) menu_file_list_cbs_t *cbs, unsigned type)
{ {
if (type == MENU_SETTING_GROUP) if (type == FILE_TYPE_PLAYLIST_COLLECTION)
{
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_category);
}
else if (type == FILE_TYPE_PLAYLIST_COLLECTION)
{ {
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_rdb_collection); BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_rdb_collection);
} }

6
menu/menu_displaylist.c
View File

@ -3718,7 +3718,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
{ {
case DISPLAYLIST_HELP_SCREEN_LIST: case DISPLAYLIST_HELP_SCREEN_LIST:
case DISPLAYLIST_MAIN_MENU: case DISPLAYLIST_MAIN_MENU:
case DISPLAYLIST_SETTINGS:
case DISPLAYLIST_SETTINGS_ALL: case DISPLAYLIST_SETTINGS_ALL:
case DISPLAYLIST_HORIZONTAL: case DISPLAYLIST_HORIZONTAL:
case DISPLAYLIST_HORIZONTAL_CONTENT_ACTIONS: case DISPLAYLIST_HORIZONTAL_CONTENT_ACTIONS:
@ -3950,11 +3949,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
goto error; goto error;
} }
return true; return true;
case DISPLAYLIST_SETTINGS:
ret = menu_displaylist_parse_settings(menu, info,
info->label, PARSE_NONE, true);
info->need_push = true;
break;
case DISPLAYLIST_MAIN_MENU: case DISPLAYLIST_MAIN_MENU:
{ {
rarch_system_info_t *system = NULL; rarch_system_info_t *system = NULL;

1
menu/menu_displaylist.h
View File

@ -58,7 +58,6 @@ enum menu_displaylist_ctl_state
DISPLAYLIST_MAIN_MENU, DISPLAYLIST_MAIN_MENU,
DISPLAYLIST_GENERIC, DISPLAYLIST_GENERIC,
DISPLAYLIST_SETTING_ENUM, DISPLAYLIST_SETTING_ENUM,
DISPLAYLIST_SETTINGS,
DISPLAYLIST_SETTINGS_ALL, DISPLAYLIST_SETTINGS_ALL,
DISPLAYLIST_HORIZONTAL, DISPLAYLIST_HORIZONTAL,
DISPLAYLIST_HORIZONTAL_CONTENT_ACTIONS, DISPLAYLIST_HORIZONTAL_CONTENT_ACTIONS,