mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 15:45:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify CONFIG_BOOL/menu_setting.c

Browse Source
This commit is contained in:
twinaphex 2016-10-26 05:04:24 +02:00
parent 830f64446b
commit 24e9f8dc09
4 changed files with 468 additions and 414 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gfx/video_driver.c
View File

@ -1202,11 +1202,11 @@ void video_driver_menu_settings(void **list_data, void *list_info_data,
CONFIG_BOOL( CONFIG_BOOL(
list, list_info, list, list_info,
&global->console.screen.pal60_enable, &global->console.screen.pal60_enable,
msg_hash_to_str(MENU_ENUM_LABEL_PAL60_ENABLE), MENU_ENUM_LABEL_PAL60_ENABLE,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PAL60_ENABLE), MENU_ENUM_LABEL_VALUE_PAL60_ENABLE,
false, false,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF), MENU_ENUM_LABEL_VALUE_OFF,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ON), MENU_ENUM_LABEL_VALUE_ON,
group_info, group_info,
subgroup_info, subgroup_info,
parent_group, parent_group,
@ -1247,11 +1247,11 @@ void video_driver_menu_settings(void **list_data, void *list_info_data,
CONFIG_BOOL( CONFIG_BOOL(
list, list_info, list, list_info,
&global->console.softfilter_enable, &global->console.softfilter_enable,
msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_SOFT_FILTER), MENU_ENUM_LABEL_VIDEO_SOFT_FILTER,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_SOFT_FILTER), MENU_ENUM_LABEL_VALUE_VIDEO_SOFT_FILTER,
false, false,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF), MENU_ENUM_LABEL_VALUE_OFF,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ON), MENU_ENUM_LABEL_VALUE_ON,
group_info, group_info,
subgroup_info, subgroup_info,
parent_group, parent_group,

798
menu/menu_setting.c
View File

File diff suppressed because it is too large Load Diff

44
setting_list.c
View File

@ -1430,13 +1430,14 @@ static rarch_setting_t setting_int_setting(const char* name,
return result; return result;
} }
bool CONFIG_BOOL( bool CONFIG_BOOL_ALT(
rarch_setting_t **list, rarch_setting_t **list,
rarch_setting_info_t *list_info, rarch_setting_info_t *list_info,
bool *target, bool *target,
const char *name, const char *SHORT, const char *name, const char *SHORT,
bool default_value, bool default_value,
const char *off, const char *on, enum msg_hash_enums off_enum_idx,
enum msg_hash_enums on_enum_idx,
rarch_setting_group_info_t *group_info, rarch_setting_group_info_t *group_info,
rarch_setting_group_info_t *subgroup_info, rarch_setting_group_info_t *subgroup_info,
const char *parent_group, const char *parent_group,
@ -1445,7 +1446,44 @@ bool CONFIG_BOOL(
uint32_t flags) uint32_t flags)
{ {
rarch_setting_t value = setting_bool_setting (name, SHORT, target, rarch_setting_t value = setting_bool_setting (name, SHORT, target,
default_value, off, on, default_value,
msg_hash_to_str(off_enum_idx), msg_hash_to_str(on_enum_idx),
group_info->name, subgroup_info->name, parent_group,
change_handler, read_handler);
if (!settings_list_append(list, list_info))
return false;
if (value.name)
value.name_hash = msg_hash_calculate(value.name);
(*list)[list_info->index++] = value;
if (flags != SD_FLAG_NONE)
settings_data_list_current_add_flags(list, list_info, flags);
return true;
}
bool CONFIG_BOOL(
rarch_setting_t **list,
rarch_setting_info_t *list_info,
bool *target,
enum msg_hash_enums name_enum_idx,
enum msg_hash_enums SHORT_enum_idx,
bool default_value,
enum msg_hash_enums off_enum_idx,
enum msg_hash_enums on_enum_idx,
rarch_setting_group_info_t *group_info,
rarch_setting_group_info_t *subgroup_info,
const char *parent_group,
change_handler_t change_handler,
change_handler_t read_handler,
uint32_t flags)
{
rarch_setting_t value = setting_bool_setting (
msg_hash_to_str(name_enum_idx),
msg_hash_to_str(SHORT_enum_idx),
target,
default_value,
msg_hash_to_str(off_enum_idx),
msg_hash_to_str(on_enum_idx),
group_info->name, subgroup_info->name, parent_group, group_info->name, subgroup_info->name, parent_group,
change_handler, read_handler); change_handler, read_handler);

24
setting_list.h
View File

@ -211,20 +211,36 @@ bool CONFIG_ACTION(
rarch_setting_group_info_t *subgroup_info, rarch_setting_group_info_t *subgroup_info,
const char *parent_group); const char *parent_group);
bool CONFIG_BOOL( bool CONFIG_BOOL_ALT(
rarch_setting_t **list, rarch_setting_t **list,
rarch_setting_info_t *list_info, rarch_setting_info_t *list_info,
bool *target, bool *target,
const char *name, const char *SHORT, const char *name, const char *SHORT,
bool default_value, bool default_value,
const char *off, const char *on, enum msg_hash_enums off_enum_idx,
enum msg_hash_enums on_enum_idx,
rarch_setting_group_info_t *group_info, rarch_setting_group_info_t *group_info,
rarch_setting_group_info_t *subgroup_info, rarch_setting_group_info_t *subgroup_info,
const char *parent_group, const char *parent_group,
change_handler_t change_handler, change_handler_t change_handler,
change_handler_t read_handler, change_handler_t read_handler,
uint32_t flags uint32_t flags);
);
bool CONFIG_BOOL(
rarch_setting_t **list,
rarch_setting_info_t *list_info,
bool *target,
enum msg_hash_enums name_enum_idx,
enum msg_hash_enums SHORT_enum_idx,
bool default_value,
enum msg_hash_enums off_enum_idx,
enum msg_hash_enums on_enum_idx,
rarch_setting_group_info_t *group_info,
rarch_setting_group_info_t *subgroup_info,
const char *parent_group,
change_handler_t change_handler,
change_handler_t read_handler,
uint32_t flags);
bool CONFIG_INT( bool CONFIG_INT(
rarch_setting_t **list, rarch_setting_t **list,