mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-01 07:13:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Menu) Remove MENU_SETTINGS_CORE enum

Browse Source
This commit is contained in:
twinaphex 2014-09-04 00:18:26 +02:00
parent d5956f768b
commit a72a866db3
6 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/menu/backend/menu_common_backend.c
View File

@ -1286,7 +1286,7 @@ static int menu_setting_ok_toggle(unsigned type,
} }
else if ( else if (
menu_common_type_is(label, type) == MENU_SETTINGS || menu_common_type_is(label, type) == MENU_SETTINGS ||
type == MENU_SETTINGS_CORE || !strcmp(label, "core_list") ||
type == MENU_SETTINGS_CONFIG || type == MENU_SETTINGS_CONFIG ||
type == MENU_SETTINGS_DISK_APPEND type == MENU_SETTINGS_DISK_APPEND
) )
@ -1880,7 +1880,7 @@ static int menu_action_ok(const char *dir,
menu_flush_stack_type(driver.menu->menu_stack,MENU_SETTINGS); menu_flush_stack_type(driver.menu->menu_stack,MENU_SETTINGS);
return -1; return -1;
} }
else if (menu_type == MENU_SETTINGS_CORE) else if (!strcmp(menu_label, "core_list"))
{ {
fill_pathname_join(g_settings.libretro, dir, path, fill_pathname_join(g_settings.libretro, dir, path,
sizeof(g_settings.libretro)); sizeof(g_settings.libretro));

2
frontend/menu/disp/rgui.c
View File

@ -401,7 +401,7 @@ static void rgui_render(void)
else else
#endif #endif
/* Pretty-print libretro cores from menu. */ /* Pretty-print libretro cores from menu. */
if (menu_type == MENU_SETTINGS_CORE || if (!strcmp(label, "core_list") ||
menu_type == MENU_SETTINGS_DEFERRED_CORE) menu_type == MENU_SETTINGS_DEFERRED_CORE)
{ {
if (type == MENU_FILE_PLAIN) if (type == MENU_FILE_PLAIN)

2
frontend/menu/disp/rmenu.c
View File

@ -270,7 +270,7 @@ static void rmenu_render(void)
#endif #endif
/* Pretty-print libretro cores from menu. */ /* Pretty-print libretro cores from menu. */
if ( if (
menu_type == MENU_SETTINGS_CORE || !strcmp(label, "core_list") ||
menu_type == MENU_SETTINGS_DEFERRED_CORE) menu_type == MENU_SETTINGS_DEFERRED_CORE)
{ {
if (type == MENU_FILE_PLAIN) if (type == MENU_FILE_PLAIN)

2
frontend/menu/disp/rmenu_xui.cpp
View File

@ -469,7 +469,7 @@ static void rmenu_xui_render(void)
} }
else else
// Pretty-print libretro cores from menu. // Pretty-print libretro cores from menu.
if (menu_type == MENU_SETTINGS_CORE || if (!strcmp(label, "core_list") ||
menu_type == MENU_SETTINGS_DEFERRED_CORE) menu_type == MENU_SETTINGS_DEFERRED_CORE)
{ {
if (type == MENU_FILE_PLAIN) if (type == MENU_FILE_PLAIN)

1
frontend/menu/menu_common.h
View File

@ -105,7 +105,6 @@ typedef enum
MENU_SETTINGS_SHADER_PRESET_SAVE, MENU_SETTINGS_SHADER_PRESET_SAVE,
// settings options are done here too // settings options are done here too
MENU_SETTINGS_CORE,
MENU_SETTINGS_DEFERRED_CORE, MENU_SETTINGS_DEFERRED_CORE,
MENU_SETTINGS_CONFIG, MENU_SETTINGS_CONFIG,
MENU_SETTINGS_CORE_OPTIONS, MENU_SETTINGS_CORE_OPTIONS,

4
frontend/menu/menu_entries.c
View File

@ -102,7 +102,7 @@ int menu_entries_push_list(menu_handle_t *menu,
{ {
setting_data = (rarch_setting_t *)setting_data_get_mainmenu(true); setting_data = (rarch_setting_t *)setting_data_get_mainmenu(true);
file_list_clear(list); file_list_clear(list);
add_setting_entry(menu,list,"core_list", MENU_SETTINGS_CORE, setting_data); add_setting_entry(menu,list,"core_list", 0, setting_data);
add_setting_entry(menu,list,"history_list", 0, setting_data); add_setting_entry(menu,list,"history_list", 0, setting_data);
add_setting_entry(menu,list,"detect_core_list", 0, setting_data); add_setting_entry(menu,list,"detect_core_list", 0, setting_data);
add_setting_entry(menu,list,"load_content", 0, setting_data); add_setting_entry(menu,list,"load_content", 0, setting_data);
@ -582,7 +582,7 @@ int menu_parse_check(const char *label, unsigned menu_type)
menu_type == MENU_CONTENT_HISTORY_PATH || menu_type == MENU_CONTENT_HISTORY_PATH ||
!strcmp(label, "video_filter") || !strcmp(label, "video_filter") ||
!strcmp(label, "audio_dsp_plugin") || !strcmp(label, "audio_dsp_plugin") ||
menu_type == MENU_SETTINGS_CORE || !strcmp(label, "core_list") ||
menu_type == MENU_SETTINGS_CONFIG || menu_type == MENU_SETTINGS_CONFIG ||
menu_type == MENU_SETTINGS_DISK_APPEND))) menu_type == MENU_SETTINGS_DISK_APPEND)))
return -1; return -1;