mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-11 15:40:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of MENU_ENTRIES_CTL_SETTINGS_GET

Browse Source
This commit is contained in:
libretroadmin 2023-05-10 07:28:14 +02:00
parent 74ad3723f9
commit 5de30567a1
3 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
menu/menu_driver.c
View File

@ -4393,14 +4393,6 @@ bool menu_entries_ctl(enum menu_entries_ctl_state state, void *data)
{ {
case MENU_ENTRIES_CTL_NEEDS_REFRESH: case MENU_ENTRIES_CTL_NEEDS_REFRESH:
return MENU_ENTRIES_NEEDS_REFRESH(menu_st); return MENU_ENTRIES_NEEDS_REFRESH(menu_st);
case MENU_ENTRIES_CTL_SETTINGS_GET:
{
rarch_setting_t **settings = (rarch_setting_t**)data;
if (!settings)
return false;
*settings = menu_st->entries.list_settings;
}
break;
case MENU_ENTRIES_CTL_SET_REFRESH: case MENU_ENTRIES_CTL_SET_REFRESH:
{ {
bool *nonblocking = (bool*)data; bool *nonblocking = (bool*)data;

1
menu/menu_entries.h
View File

@ -38,7 +38,6 @@ RETRO_BEGIN_DECLS
enum menu_entries_ctl_state enum menu_entries_ctl_state
{ {
MENU_ENTRIES_CTL_NONE = 0, MENU_ENTRIES_CTL_NONE = 0,
MENU_ENTRIES_CTL_SETTINGS_GET,
MENU_ENTRIES_CTL_SET_REFRESH, MENU_ENTRIES_CTL_SET_REFRESH,
MENU_ENTRIES_CTL_UNSET_REFRESH, MENU_ENTRIES_CTL_UNSET_REFRESH,
MENU_ENTRIES_CTL_NEEDS_REFRESH, MENU_ENTRIES_CTL_NEEDS_REFRESH,

8
menu/menu_setting.c
View File

@ -7110,11 +7110,13 @@ rarch_setting_t *menu_setting_find(const char *label)
{ {
rarch_setting_t *setting = NULL; rarch_setting_t *setting = NULL;
rarch_setting_t **list = &setting; rarch_setting_t **list = &setting;
struct menu_state *menu_st;
if (!label) if (!label)
return NULL; return NULL;
menu_entries_ctl(MENU_ENTRIES_CTL_SETTINGS_GET, &setting); menu_st = menu_state_get_ptr();
setting = menu_st->entries.list_settings;
if (!setting) if (!setting)
return NULL; return NULL;
@ -7145,11 +7147,13 @@ rarch_setting_t *menu_setting_find_enum(enum msg_hash_enums enum_idx)
{ {
rarch_setting_t *setting = NULL; rarch_setting_t *setting = NULL;
rarch_setting_t **list = &setting; rarch_setting_t **list = &setting;
struct menu_state *menu_st = NULL;
if (enum_idx == 0) if (enum_idx == 0)
return NULL; return NULL;
menu_entries_ctl(MENU_ENTRIES_CTL_SETTINGS_GET, &setting); menu_st = menu_state_get_ptr();
setting = menu_st->entries.list_settings;
if (!setting) if (!setting)
return NULL; return NULL;