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

(Menu) Get rid of performance counters enums

Browse Source
This commit is contained in:
twinaphex 2014-09-04 05:27:47 +02:00
parent eac82398a5
commit c61e552f08
5 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2339,8 +2339,6 @@ static void menu_common_setting_set_label(char *type_str,
case MENU_SETTINGS_SHADER_PRESET:
case MENU_SETTINGS_SHADER_PRESET_SAVE:
case MENU_SETTINGS_DISK_APPEND:
case MENU_SETTINGS_PERFORMANCE_COUNTERS_FRONTEND:
case MENU_SETTINGS_PERFORMANCE_COUNTERS_LIBRETRO:
case MENU_SETTINGS_CUSTOM_BIND_ALL:
case MENU_SETTINGS_CUSTOM_BIND_DEFAULT_ALL:
strlcpy(type_str, "...", type_str_size);

6
frontend/menu/disp/shared.h
View File

@ -33,10 +33,10 @@ static void get_title(const char *label, const char *dir,
strlcpy(title, "DRIVER OPTIONS", sizeof_title);
else if (!strcmp(label, "performance_counters"))
strlcpy(title, "PERFORMANCE COUNTERS", sizeof_title);
else if (menu_type == MENU_SETTINGS_PERFORMANCE_COUNTERS_LIBRETRO)
strlcpy(title, "CORE PERFORMANCE COUNTERS", sizeof_title);
else if (menu_type == MENU_SETTINGS_PERFORMANCE_COUNTERS_FRONTEND)
else if (!strcmp(label, "frontend_counters"))
strlcpy(title, "FRONTEND PERFORMANCE COUNTERS", sizeof_title);
else if (!strcmp(label, "core_counters"))
strlcpy(title, "CORE PERFORMANCE COUNTERS", sizeof_title);
#ifdef HAVE_SHADER_MANAGER
else if (menu_type == MENU_SETTINGS_SHADER_OPTIONS)
strlcpy(title, "SHADER OPTIONS", sizeof_title);

4
frontend/menu/menu_common.c
View File

@ -662,8 +662,8 @@ unsigned menu_common_type_is(const char *label, unsigned type)
type == MENU_SETTINGS_OPTIONS ||
type == MENU_SETTINGS_DRIVERS ||
!strcmp(label, "performance_counters") ||
type == MENU_SETTINGS_PERFORMANCE_COUNTERS_LIBRETRO ||
type == MENU_SETTINGS_PERFORMANCE_COUNTERS_FRONTEND ||
!strcmp(label, "frontend_counters") ||
!strcmp(label, "core_counters") ||
type == MENU_SETTINGS_INPUT_OPTIONS
)
return MENU_SETTINGS;

2
frontend/menu/menu_common.h
View File

@ -115,8 +115,6 @@ typedef enum
MENU_SETTINGS_PRIVACY_OPTIONS,
MENU_SETTINGS_OPTIONS,
MENU_SETTINGS_DRIVERS,
MENU_SETTINGS_PERFORMANCE_COUNTERS_LIBRETRO,
MENU_SETTINGS_PERFORMANCE_COUNTERS_FRONTEND,
MENU_SETTINGS_DISK_OPTIONS,
MENU_SETTINGS_DISK_INDEX,
MENU_SETTINGS_DISK_APPEND,

30
frontend/menu/menu_entries.c
View File

@ -178,10 +178,10 @@ int menu_entries_push_list(menu_handle_t *menu,
else if (!strcmp(label, "performance_counters"))
{
file_list_clear(list);
file_list_push(list, "Frontend Counters", "",
MENU_SETTINGS_PERFORMANCE_COUNTERS_FRONTEND, 0);
file_list_push(list, "Core Counters", "",
MENU_SETTINGS_PERFORMANCE_COUNTERS_LIBRETRO, 0);
file_list_push(list, "Frontend Counters", "frontend_counters",
MENU_FILE_SWITCH, 0);
file_list_push(list, "Core Counters", "core_counters",
MENU_FILE_SWITCH, 0);
}
else if (!strcmp(label, "core_information"))
{
@ -303,6 +303,18 @@ int menu_entries_push_list(menu_handle_t *menu,
add_setting_entry(menu,list,"netplay_tcp_udp_port", 0, setting_data);
add_setting_entry(menu,list,"netplay_delay_frames", 0, setting_data);
}
else if (!strcmp(label, "core_counters"))
{
file_list_clear(list);
menu_entries_push_perfcounter(menu, list, perf_counters_libretro,
perf_ptr_libretro, MENU_SETTINGS_LIBRETRO_PERF_COUNTERS_BEGIN);
}
else if (!strcmp(label, "frontend_counters"))
{
file_list_clear(list);
menu_entries_push_perfcounter(menu, list, perf_counters_rarch,
perf_ptr_rarch, MENU_SETTINGS_PERF_COUNTERS_BEGIN);
}
else
{
switch (menu_type)
@ -529,16 +541,6 @@ int menu_entries_push_list(menu_handle_t *menu,
add_setting_entry(menu,list,"location_driver", 0, setting_data);
add_setting_entry(menu,list,"menu_driver", 0, setting_data);
break;
case MENU_SETTINGS_PERFORMANCE_COUNTERS_LIBRETRO:
file_list_clear(list);
menu_entries_push_perfcounter(menu, list, perf_counters_libretro,
perf_ptr_libretro, MENU_SETTINGS_LIBRETRO_PERF_COUNTERS_BEGIN);
break;
case MENU_SETTINGS_PERFORMANCE_COUNTERS_FRONTEND:
file_list_clear(list);
menu_entries_push_perfcounter(menu, list, perf_counters_rarch,
perf_ptr_rarch, MENU_SETTINGS_PERF_COUNTERS_BEGIN);
break;
}
}