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

Simplify CONFIG_STRING

Browse Source
This commit is contained in:
twinaphex 2016-10-26 05:22:07 +02:00
parent d01d4a8532
commit c8f11665df
3 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
menu/menu_setting.c
View File

@ -3968,8 +3968,8 @@ static bool setting_append_list(
list, list_info, list, list_info,
settings->audio.device, settings->audio.device,
sizeof(settings->audio.device), sizeof(settings->audio.device),
msg_hash_to_str(MENU_ENUM_LABEL_AUDIO_DEVICE), MENU_ENUM_LABEL_AUDIO_DEVICE,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_AUDIO_DEVICE), MENU_ENUM_LABEL_VALUE_AUDIO_DEVICE,
"", "",
&group_info, &group_info,
&subgroup_info, &subgroup_info,
@ -4414,8 +4414,8 @@ static bool setting_append_list(
list, list_info, list, list_info,
global->record.path, global->record.path,
sizeof(global->record.path), sizeof(global->record.path),
msg_hash_to_str(MENU_ENUM_LABEL_RECORD_PATH), MENU_ENUM_LABEL_RECORD_PATH,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_RECORD_PATH), MENU_ENUM_LABEL_VALUE_RECORD_PATH,
"", "",
&group_info, &group_info,
&subgroup_info, &subgroup_info,
@ -5714,13 +5714,12 @@ static bool setting_append_list(
parent_group = msg_hash_to_str(MENU_ENUM_LABEL_UPDATER_SETTINGS); parent_group = msg_hash_to_str(MENU_ENUM_LABEL_UPDATER_SETTINGS);
START_SUB_GROUP(list, list_info, "State", &group_info, &subgroup_info, parent_group); START_SUB_GROUP(list, list_info, "State", &group_info, &subgroup_info, parent_group);
#ifdef HAVE_NETWORKING #ifdef HAVE_NETWORKING
CONFIG_STRING( CONFIG_STRING(
list, list_info, list, list_info,
settings->network.buildbot_url, settings->network.buildbot_url,
sizeof(settings->network.buildbot_url), sizeof(settings->network.buildbot_url),
msg_hash_to_str(MENU_ENUM_LABEL_CORE_UPDATER_BUILDBOT_URL), MENU_ENUM_LABEL_CORE_UPDATER_BUILDBOT_URL,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_UPDATER_BUILDBOT_URL), MENU_ENUM_LABEL_VALUE_CORE_UPDATER_BUILDBOT_URL,
buildbot_server_url, buildbot_server_url,
&group_info, &group_info,
&subgroup_info, &subgroup_info,
@ -5734,8 +5733,8 @@ static bool setting_append_list(
list, list_info, list, list_info,
settings->network.buildbot_assets_url, settings->network.buildbot_assets_url,
sizeof(settings->network.buildbot_assets_url), sizeof(settings->network.buildbot_assets_url),
msg_hash_to_str(MENU_ENUM_LABEL_BUILDBOT_ASSETS_URL), MENU_ENUM_LABEL_BUILDBOT_ASSETS_URL,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_BUILDBOT_ASSETS_URL), MENU_ENUM_LABEL_VALUE_BUILDBOT_ASSETS_URL,
buildbot_assets_server_url, buildbot_assets_server_url,
&group_info, &group_info,
&subgroup_info, &subgroup_info,
@ -5783,8 +5782,8 @@ static bool setting_append_list(
list, list_info, list, list_info,
settings->netplay.server, settings->netplay.server,
sizeof(settings->netplay.server), sizeof(settings->netplay.server),
msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY_IP_ADDRESS), MENU_ENUM_LABEL_NETPLAY_IP_ADDRESS,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_IP_ADDRESS), MENU_ENUM_LABEL_VALUE_NETPLAY_IP_ADDRESS,
"", "",
&group_info, &group_info,
&subgroup_info, &subgroup_info,
@ -6084,8 +6083,8 @@ static bool setting_append_list(
list, list_info, list, list_info,
settings->username, settings->username,
sizeof(settings->username), sizeof(settings->username),
msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY_NICKNAME), MENU_ENUM_LABEL_NETPLAY_NICKNAME,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_NICKNAME), MENU_ENUM_LABEL_VALUE_NETPLAY_NICKNAME,
"", "",
&group_info, &group_info,
&subgroup_info, &subgroup_info,
@ -6162,8 +6161,8 @@ static bool setting_append_list(
list, list_info, list, list_info,
settings->cheevos.username, settings->cheevos.username,
sizeof(settings->cheevos.username), sizeof(settings->cheevos.username),
msg_hash_to_str(MENU_ENUM_LABEL_CHEEVOS_USERNAME), MENU_ENUM_LABEL_CHEEVOS_USERNAME,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ACCOUNTS_CHEEVOS_USERNAME), MENU_ENUM_LABEL_VALUE_ACCOUNTS_CHEEVOS_USERNAME,
"", "",
&group_info, &group_info,
&subgroup_info, &subgroup_info,
@ -6177,8 +6176,8 @@ static bool setting_append_list(
list, list_info, list, list_info,
settings->cheevos.password, settings->cheevos.password,
sizeof(settings->cheevos.password), sizeof(settings->cheevos.password),
msg_hash_to_str(MENU_ENUM_LABEL_CHEEVOS_PASSWORD), MENU_ENUM_LABEL_CHEEVOS_PASSWORD,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ACCOUNTS_CHEEVOS_PASSWORD), MENU_ENUM_LABEL_VALUE_ACCOUNTS_CHEEVOS_PASSWORD,
"", "",
&group_info, &group_info,
&subgroup_info, &subgroup_info,

10
setting_list.c
View File

@ -1614,15 +1614,19 @@ bool CONFIG_STRING(
rarch_setting_t **list, rarch_setting_t **list,
rarch_setting_info_t *list_info, rarch_setting_info_t *list_info,
char *target, size_t len, char *target, size_t len,
const char *name, const char *SHORT, enum msg_hash_enums name_enum_idx,
enum msg_hash_enums SHORT_enum_idx,
const char *default_value, const char *default_value,
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 read_handler) change_handler_t change_handler, change_handler_t read_handler)
{ {
rarch_setting_t value = setting_string_setting(ST_STRING, name, SHORT, target, len, default_value, "", rarch_setting_t value = setting_string_setting(ST_STRING,
group_info->name, subgroup_info->name, parent_group, change_handler, read_handler); msg_hash_to_str(name_enum_idx),
msg_hash_to_str(SHORT_enum_idx),
target, len, default_value, "",
group_info->name, subgroup_info->name, parent_group, change_handler, read_handler);
if (!(settings_list_append(list, list_info))) if (!(settings_list_append(list, list_info)))
return false; return false;
if (value.name) if (value.name)

3
setting_list.h
View File

@ -311,7 +311,8 @@ bool CONFIG_STRING(
rarch_setting_t **list, rarch_setting_t **list,
rarch_setting_info_t *list_info, rarch_setting_info_t *list_info,
char *target, size_t len, char *target, size_t len,
const char *name, const char *SHORT, enum msg_hash_enums name_enum_idx,
enum msg_hash_enums SHORT_enum_idx,
const char *default_value, const char *default_value,
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,