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

Cleanups

Browse Source
This commit is contained in:
twinaphex 2015-08-17 17:46:31 +02:00
parent a3bc91cd01
commit 97ec360eb3
4 changed files with 7 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
menu/cbs/menu_cbs_select.c
View File

@ -47,6 +47,10 @@ static int action_select_default(const char *path, const char *label, unsigned t
break;
case ST_PATH:
case ST_DIR:
case ST_ACTION:
case ST_STRING:
case ST_HEX:
case ST_BIND:
action = MENU_ACTION_OK;
break;
default:
@ -56,7 +60,7 @@ static int action_select_default(const char *path, const char *label, unsigned t
if (action == MENU_ACTION_NOOP)
{
if ((cbs && cbs->action_ok) || menu_setting_is_of_general_type(setting))
if (cbs && cbs->action_ok)
action = MENU_ACTION_OK;
else
{

2
menu/menu_entry.c
View File

@ -97,7 +97,7 @@ enum menu_entry_type menu_entry_get_type(uint32_t i)
if (menu_setting_is_of_path_type(setting))
return MENU_ENTRY_PATH;
if (menu_setting_is_of_enum_type(setting))
if (setting && (setting->type == ST_STRING) && setting->values)
return MENU_ENTRY_ENUM;
if (setting)

38
menu/menu_setting.c
View File

@ -301,9 +301,7 @@ rarch_setting_t *menu_setting_find(const char *label)
rarch_setting_t *settings = menu_setting_get_ptr();
uint32_t needle = 0;
if (!settings)
return NULL;
if (!label)
if (!settings || !label)
return NULL;
needle = menu_hash_calculate(label);
@ -6324,37 +6322,3 @@ bool menu_setting_is_of_path_type(rarch_setting_t *setting)
return true;
return false;
}
bool menu_setting_is_of_general_type(rarch_setting_t *setting)
{
if (
setting &&
(setting->type > ST_ACTION) &&
(setting->type < ST_GROUP)
)
return true;
return false;
}
bool menu_setting_is_of_numeric_type(rarch_setting_t *setting)
{
if (
setting &&
((setting->type == ST_INT) ||
(setting->type == ST_UINT) ||
(setting->type == ST_FLOAT))
)
return true;
return false;
}
bool menu_setting_is_of_enum_type(rarch_setting_t *setting)
{
if (
setting &&
(setting->type == ST_STRING) &&
setting->values
)
return true;
return false;
}

6
menu/menu_setting.h
View File

@ -297,12 +297,6 @@ rarch_setting_t* menu_setting_new(unsigned mask);
bool menu_setting_is_of_path_type(rarch_setting_t *setting);
bool menu_setting_is_of_general_type(rarch_setting_t *setting);
bool menu_setting_is_of_numeric_type(rarch_setting_t *setting);
bool menu_setting_is_of_enum_type(rarch_setting_t *setting);
int menu_action_handle_setting(rarch_setting_t *setting,
unsigned type, unsigned action, bool wraparound);