mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 03:32:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean the Configuration mess some more

Browse Source
This commit is contained in:
lasers 2016-11-20 02:08:08 -06:00
parent 6265d1e90a
commit 67f1dc3859
21 changed files with 91 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
intl/msg_hash_chs.c
View File

@ -2010,7 +2010,7 @@ static const char *menu_hash_to_str_chs_label_enum(enum msg_hash_enums msg)
return "collection";
case MENU_ENUM_LABEL_CONFIG_LOAD:
return "configurations";
case MENU_ENUM_LABEL_CONFIGURATION_SETTINGS:
case MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS:
return "configuration_settings";
case MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT:
return "config_save_on_exit";
@ -2090,7 +2090,7 @@ static const char *menu_hash_to_str_chs_label_enum(enum msg_hash_enums msg)
return "deferred_archive_open_detect_core";
case MENU_ENUM_LABEL_DEFERRED_AUDIO_SETTINGS_LIST:
return "deferred_audio_settings_list";
case MENU_ENUM_LABEL_DEFERRED_CONFIGURATION_SETTINGS_LIST:
case MENU_ENUM_LABEL_DEFERRED_CONFIGURATIONS_SETTINGS:
return "deferred_configuration_settings_list";
case MENU_ENUM_LABEL_DEFERRED_CORE_CONTENT_DIRS_LIST:
return "deferred_core_content_dirs_list";
@ -3147,7 +3147,7 @@ const char *msg_hash_to_str_chs(enum msg_hash_enums msg)
return "配置";
case MENU_ENUM_LABEL_VALUE_CONFIG_LOAD:
return "加载配置";
case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS:
case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS:
return "配置";
case MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT:
return "退出时保存配置";

2
intl/msg_hash_de.c
View File

@ -510,7 +510,7 @@ const char *msg_hash_to_str_de(enum msg_hash_enums msg)
return "Untergruppen einklappen";
case MENU_ENUM_LABEL_VALUE_CONFIG_LOAD:
return "Lade Konfigurationsdatei"; /* FIXME/UPDATE */
case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS:
case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS:
return "Konfigurations-Einstellungen";
case MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT:
return "Speichere Konfiguration beim Beenden";

2
intl/msg_hash_es.c
View File

@ -1589,7 +1589,7 @@ const char *msg_hash_to_str_es(enum msg_hash_enums msg)
return "Cerrar";
case MENU_ENUM_LABEL_VALUE_CONFIG_LOAD:
return "Cargar configuración";
case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS:
case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS:
return "Configuración";
case MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT:
return "Guardar configuración al salir";

2
intl/msg_hash_fr.c
View File

@ -132,7 +132,7 @@ const char *msg_hash_to_str_fr(enum msg_hash_enums msg)
return "Fusionner les sous-groupes";
case MENU_ENUM_LABEL_VALUE_CONFIG_LOAD:
return "Charger une configuration";
case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS:
case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS:
return "Configurations";
case MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT:
return "Sauver la config en quittant";

2
intl/msg_hash_it.c
View File

@ -1270,7 +1270,7 @@ const char *msg_hash_to_str_it(enum msg_hash_enums msg)
return "Nessun contatore di performance.";
case MENU_ENUM_LABEL_VALUE_DRIVER_SETTINGS:
return "Driver";
case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS:
case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS:
return "Configurazione";
case MENU_ENUM_LABEL_VALUE_CORE_SETTINGS:
return "Core";

9
intl/msg_hash_ja.c
View File

@ -2040,7 +2040,7 @@ static const char *menu_hash_to_str_jp_label_enum(enum msg_hash_enums msg)
return "collection";
case MENU_ENUM_LABEL_CONFIG_LOAD:
return "configurations";
case MENU_ENUM_LABEL_CONFIGURATION_SETTINGS:
case MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS:
return "configuration_settings";
case MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT:
return "config_save_on_exit";
@ -2120,7 +2120,7 @@ static const char *menu_hash_to_str_jp_label_enum(enum msg_hash_enums msg)
return "deferred_archive_open_detect_core";
case MENU_ENUM_LABEL_DEFERRED_AUDIO_SETTINGS_LIST:
return "deferred_audio_settings_list";
case MENU_ENUM_LABEL_DEFERRED_CONFIGURATION_SETTINGS_LIST:
case MENU_ENUM_LABEL_DEFERRED_CONFIGURATIONS_SETTINGS:
return "deferred_configuration_settings_list";
case MENU_ENUM_LABEL_DEFERRED_CORE_CONTENT_DIRS_LIST:
return "deferred_core_content_dirs_list";
@ -3178,9 +3178,8 @@ const char *msg_hash_to_str_jp(enum msg_hash_enums msg)
case MENU_ENUM_LABEL_VALUE_CONFIG_LOAD:
return "設定をロード";
case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS:
return "設定ファイル";
case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS:
return "設定";
/* Is Google Translation okay for "Configurations Settings" */
return "設定の設定";
case MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT:
return "終了前に設定を自動保存";
case MENU_ENUM_LABEL_VALUE_CONFIRM_ON_EXIT:

10
intl/msg_hash_lbl.h
View File

@ -10,8 +10,6 @@ MSG_HASH(MENU_ENUM_LABEL_ACHIEVEMENT_LIST_HARDCORE,
"achievement_list_hardcore")
MSG_HASH(MENU_ENUM_LABEL_ADD_CONTENT_LIST,
"add_content")
MSG_HASH(MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS,
"configurations_list")
MSG_HASH(MENU_ENUM_LABEL_ADD_TAB,
"add_tab")
MSG_HASH(MENU_ENUM_LABEL_ARCHIVE_MODE,
@ -145,9 +143,9 @@ MSG_HASH(MENU_ENUM_LABEL_CLOSE_CONTENT,
MSG_HASH(MENU_ENUM_LABEL_COLLECTION,
"collection")
MSG_HASH(MENU_ENUM_LABEL_CONFIG_LOAD,
"configurations")
MSG_HASH(MENU_ENUM_LABEL_CONFIGURATION_SETTINGS,
"configuration_settings")
"configurations_load")
MSG_HASH(MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS,
"configurations_settings")
MSG_HASH(MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT,
"config_save_on_exit")
MSG_HASH(MENU_ENUM_LABEL_CONNECT_WIFI,
@ -224,7 +222,7 @@ MSG_HASH(MENU_ENUM_LABEL_DEFERRED_ARCHIVE_OPEN_DETECT_CORE,
"deferred_archive_open_detect_core")
MSG_HASH(MENU_ENUM_LABEL_DEFERRED_AUDIO_SETTINGS_LIST,
"deferred_audio_settings_list")
MSG_HASH(MENU_ENUM_LABEL_DEFERRED_CONFIGURATION_SETTINGS_LIST,
MSG_HASH(MENU_ENUM_LABEL_DEFERRED_CONFIGURATIONS_SETTINGS,
"deferred_configuration_settings_list")
MSG_HASH(MENU_ENUM_LABEL_DEFERRED_CORE_CONTENT_DIRS_LIST,
"deferred_core_content_dirs_list")

2
intl/msg_hash_nl.c
View File

@ -137,7 +137,7 @@ const char *msg_hash_to_str_nl(enum msg_hash_enums msg)
return "Afsluiten";
case MENU_ENUM_LABEL_VALUE_CONFIG_LOAD:
return "Laad Configuratie";
case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS:
case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS:
return "Configuratie";
case MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT:
return "Configuratie Opslaan Tijdens Afsluiten";

2
intl/msg_hash_pl.c
View File

@ -106,7 +106,7 @@ const char *msg_hash_to_str_pl(enum msg_hash_enums msg)
return "Zamknij";
case MENU_ENUM_LABEL_VALUE_CONFIG_LOAD:
return "Wczytaj konfigurację";
case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS:
case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS:
return "Ustawienia konfiguracji";
case MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT:
return "Zapisz konfigurację przy wyjściu";

2
intl/msg_hash_pt.c
View File

@ -1044,7 +1044,7 @@ const char *msg_hash_to_str_pt(enum msg_hash_enums msg)
return "Fechar";
case MENU_ENUM_LABEL_VALUE_CONFIG_LOAD:
return "Carregar Configuração";
case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS:
case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS:
return "Configurações";
case MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT:
return "Salvar Configuração ao Sair";

6
intl/msg_hash_us.h
View File

@ -383,10 +383,6 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_CONFIG_LOAD,
"Load Configuration..."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS,
"Configuration"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT,
"Save Configuration on Exit"
@ -1614,7 +1610,7 @@ MSG_HASH(MENU_ENUM_SUBLABEL_DRIVER_SETTINGS,
"Change drivers for the system.")
MSG_HASH(MENU_ENUM_SUBLABEL_RETRO_ACHIEVEMENTS_SETTINGS,
"Change settings for the achievements.")
MSG_HASH(MENU_ENUM_SUBLABEL_CONFIGURATION_SETTINGS,
MSG_HASH(MENU_ENUM_SUBLABEL_CONFIGURATIONS_SETTINGS,
"Change settings for configurations, content overrides, core overrides, remaps and more.")
MSG_HASH(MENU_ENUM_SUBLABEL_CORE_SETTINGS,
"Change settings for the core.")

6
intl/msg_hash_vn.c
View File

@ -2042,7 +2042,7 @@ static const char *menu_hash_to_str_vn_label_enum(enum msg_hash_enums msg)
return "collection";
case MENU_ENUM_LABEL_CONFIG_LOAD:
return "configurations";
case MENU_ENUM_LABEL_CONFIGURATION_SETTINGS:
case MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS:
return "configuration_settings";
case MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT:
return "config_save_on_exit";
@ -2122,7 +2122,7 @@ static const char *menu_hash_to_str_vn_label_enum(enum msg_hash_enums msg)
return "deferred_archive_open_detect_core";
case MENU_ENUM_LABEL_DEFERRED_AUDIO_SETTINGS_LIST:
return "deferred_audio_settings_list";
case MENU_ENUM_LABEL_DEFERRED_CONFIGURATION_SETTINGS_LIST:
case MENU_ENUM_LABEL_DEFERRED_CONFIGURATIONS_SETTINGS:
return "deferred_configuration_settings_list";
case MENU_ENUM_LABEL_DEFERRED_CORE_CONTENT_DIRS_LIST:
return "deferred_core_content_dirs_list";
@ -3181,7 +3181,7 @@ const char *msg_hash_to_str_vn(enum msg_hash_enums msg)
return "Config";
case MENU_ENUM_LABEL_VALUE_CONFIG_LOAD:
return "Tải Configuration";
case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS:
case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS:
return "Configuration";
case MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT:
return "Save Configuration on Exit";

6
menu/cbs/menu_cbs_deferred_push.c
View File

@ -122,7 +122,7 @@ static int deferred_push_video_settings_list(menu_displaylist_info_t *info)
static int deferred_push_configuration_settings_list(menu_displaylist_info_t *info)
{
return deferred_push_dlist(info, DISPLAYLIST_CONFIGURATION_SETTINGS_LIST);
return deferred_push_dlist(info, DISPLAYLIST_CONFIGURATIONS_SETTINGS);
}
static int deferred_push_saving_settings_list(menu_displaylist_info_t *info)
@ -717,7 +717,7 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_core_settings_list);
return 0;
}
if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_CONFIGURATION_SETTINGS_LIST)))
if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_CONFIGURATIONS_SETTINGS)))
{
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_configuration_settings_list);
return 0;
@ -1070,7 +1070,7 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
case MENU_ENUM_LABEL_DEFERRED_VIDEO_SETTINGS_LIST:
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_video_settings_list);
break;
case MENU_ENUM_LABEL_DEFERRED_CONFIGURATION_SETTINGS_LIST:
case MENU_ENUM_LABEL_DEFERRED_CONFIGURATIONS_SETTINGS:
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_configuration_settings_list);
break;
case MENU_ENUM_LABEL_DEFERRED_SAVING_SETTINGS_LIST:

17
menu/cbs/menu_cbs_ok.c
View File

@ -441,6 +441,7 @@ int generic_action_ok_displaylist_push(const char *path,
info_path = path;
dl_type = DISPLAYLIST_GENERIC;
break;
/* COMMENTED OUT.
case ACTION_OK_DL_CONFIGURATIONS_SETTINGS:
info.type = type;
info.directory_ptr = idx;
@ -451,6 +452,7 @@ int generic_action_ok_displaylist_push(const char *path,
info_label = label;
dl_type = DISPLAYLIST_GENERIC;
break;
*/
case ACTION_OK_DL_COMPRESSED_ARCHIVE_PUSH_DETECT_CORE:
info.type = type;
info.directory_ptr = idx;
@ -634,12 +636,12 @@ int generic_action_ok_displaylist_push(const char *path,
info.enum_idx = MENU_ENUM_LABEL_DEFERRED_VIDEO_SETTINGS_LIST;
dl_type = DISPLAYLIST_GENERIC;
break;
case ACTION_OK_DL_CONFIGURATION_SETTINGS_LIST:
case ACTION_OK_DL_CONFIGURATIONS_SETTINGS:
info.directory_ptr = idx;
info.type = type;
info_path = path;
info_label = msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_CONFIGURATION_SETTINGS_LIST);
info.enum_idx = MENU_ENUM_LABEL_DEFERRED_CONFIGURATION_SETTINGS_LIST;
info_label = msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_CONFIGURATIONS_SETTINGS);
info.enum_idx = MENU_ENUM_LABEL_DEFERRED_CONFIGURATIONS_SETTINGS;
dl_type = DISPLAYLIST_GENERIC;
break;
case ACTION_OK_DL_SAVING_SETTINGS_LIST:
@ -1216,7 +1218,7 @@ static int action_ok_playlist_entry_start_content(const char *path,
new_core_path[0] = new_display_name[0] = '\0';
found_associated_core =
found_associated_core =
menu_content_playlist_find_associated_core(
path_base, new_core_path, sizeof(new_core_path));
@ -2138,7 +2140,7 @@ static int generic_action_ok_network(const char *path,
default:
break;
}
menu_entries_ctl(MENU_ENTRIES_CTL_SET_REFRESH, &refresh);
command_event(CMD_EVENT_NETWORK_INIT, NULL);
@ -3130,7 +3132,7 @@ static int action_ok_push_configuration_settings_list(const char *path,
{
return generic_action_ok_displaylist_push(path, NULL,
label, type, idx, entry_idx,
ACTION_OK_DL_CONFIGURATION_SETTINGS_LIST);
ACTION_OK_DL_CONFIGURATIONS_SETTINGS);
}
static int action_ok_push_core_settings_list(const char *path,
@ -3678,7 +3680,7 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
case MENU_ENUM_LABEL_CORE_SETTINGS:
BIND_ACTION_OK(cbs, action_ok_push_core_settings_list);
break;
case MENU_ENUM_LABEL_CONFIGURATION_SETTINGS:
case MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS:
BIND_ACTION_OK(cbs, action_ok_push_configuration_settings_list);
break;
case MENU_ENUM_LABEL_PLAYLIST_SETTINGS:
@ -3711,7 +3713,6 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
case MENU_ENUM_LABEL_NETPLAY:
case MENU_ENUM_LABEL_LOAD_CONTENT_LIST:
case MENU_ENUM_LABEL_ADD_CONTENT_LIST:
case MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS:
case MENU_ENUM_LABEL_HELP_LIST:
case MENU_ENUM_LABEL_INFORMATION_LIST:
case MENU_ENUM_LABEL_CONTENT_SETTINGS:

2
menu/cbs/menu_cbs_sublabel.c
View File

@ -420,7 +420,7 @@ static int action_bind_sublabel_configurations_settings_list(
char *s, size_t len)
{
strlcpy(s, msg_hash_to_str(MENU_ENUM_SUBLABEL_CONFIGURATION_SETTINGS), len);
strlcpy(s, msg_hash_to_str(MENU_ENUM_SUBLABEL_CONFIGURATIONS_SETTINGS), len);
return 0;
}

6
menu/cbs/menu_cbs_title.c
View File

@ -224,7 +224,7 @@ static int action_get_video_settings_list(const char *path, const char *label,
static int action_get_configuration_settings_list(const char *path, const char *label,
unsigned menu_type, char *s, size_t len)
{
sanitize_to_string(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS), len);
sanitize_to_string(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS), len);
return 0;
}
@ -913,7 +913,7 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs,
return 0;
}
if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_CONFIGURATION_SETTINGS_LIST)))
if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_CONFIGURATIONS_SETTINGS)))
{
BIND_ACTION_GET_TITLE(cbs, action_get_configuration_settings_list);
return 0;
@ -1247,7 +1247,7 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs,
case MENU_ENUM_LABEL_DEFERRED_VIDEO_SETTINGS_LIST:
BIND_ACTION_GET_TITLE(cbs, action_get_video_settings_list);
break;
case MENU_ENUM_LABEL_DEFERRED_CONFIGURATION_SETTINGS_LIST:
case MENU_ENUM_LABEL_DEFERRED_CONFIGURATIONS_SETTINGS:
BIND_ACTION_GET_TITLE(cbs, action_get_configuration_settings_list);
break;
case MENU_ENUM_LABEL_DEFERRED_LOGGING_SETTINGS_LIST:

3
menu/menu_cbs.h
View File

@ -48,7 +48,7 @@ enum
ACTION_OK_DL_DRIVER_SETTINGS_LIST,
ACTION_OK_DL_VIDEO_SETTINGS_LIST,
ACTION_OK_DL_AUDIO_SETTINGS_LIST,
ACTION_OK_DL_CONFIGURATION_SETTINGS_LIST,
ACTION_OK_DL_CONFIGURATIONS_SETTINGS,
ACTION_OK_DL_SAVING_SETTINGS_LIST,
ACTION_OK_DL_LOGGING_SETTINGS_LIST,
ACTION_OK_DL_FRAME_THROTTLE_SETTINGS_LIST,
@ -69,7 +69,6 @@ enum
ACTION_OK_DL_CHEAT_FILE,
ACTION_OK_DL_CORE_LIST,
ACTION_OK_DL_LAKKA_LIST,
ACTION_OK_DL_CONFIGURATIONS_SETTINGS,
ACTION_OK_DL_COMPRESSED_ARCHIVE_PUSH,
ACTION_OK_DL_COMPRESSED_ARCHIVE_PUSH_DETECT_CORE,
ACTION_OK_DL_PARENT_DIRECTORY_PUSH,

7
menu/menu_displaylist.c
View File

@ -2908,6 +2908,13 @@ static int menu_displaylist_parse_configurations_list(
MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT,
MENU_SETTING_ACTION, 0, 0);
/* You may want to check for show_advanced_settings here */
menu_entries_append_enum(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_SPECIFIC_CONFIG),
msg_hash_to_str(MENU_ENUM_LABEL_CORE_SPECIFIC_CONFIG),
MENU_ENUM_LABEL_CORE_SPECIFIC_CONFIG,
MENU_SETTING_ACTION, 0, 0);
menu_entries_append_enum(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS),
msg_hash_to_str(MENU_ENUM_LABEL_GAME_SPECIFIC_OPTIONS),

5
menu/menu_displaylist.h
View File

@ -45,7 +45,7 @@ enum menu_displaylist_parse_type
PARSE_ONLY_STRING_OPTIONS = (1 << 11),
PARSE_ONLY_HEX = (1 << 12),
PARSE_ONLY_DIR = (1 << 13),
PARSE_SUB_GROUP = (1 << 14)
PARSE_SUB_GROUP = (1 << 14)
};
enum menu_displaylist_ctl_state
@ -110,7 +110,7 @@ enum menu_displaylist_ctl_state
DISPLAYLIST_ACCOUNTS_LIST,
DISPLAYLIST_DRIVER_SETTINGS_LIST,
DISPLAYLIST_VIDEO_SETTINGS_LIST,
DISPLAYLIST_CONFIGURATION_SETTINGS_LIST,
DISPLAYLIST_CONFIGURATIONS_SETTINGS,
DISPLAYLIST_SAVING_SETTINGS_LIST,
DISPLAYLIST_LOGGING_SETTINGS_LIST,
DISPLAYLIST_FRAME_THROTTLE_SETTINGS_LIST,
@ -145,7 +145,6 @@ enum menu_displaylist_ctl_state
DISPLAYLIST_OPTIONS_SHADERS,
DISPLAYLIST_NETPLAY,
DISPLAYLIST_ADD_CONTENT_LIST,
DISPLAYLIST_CONFIGURATIONS_SETTINGS,
DISPLAYLIST_SCAN_DIRECTORY_LIST,
DISPLAYLIST_ARCHIVE_ACTION,
DISPLAYLIST_ARCHIVE_ACTION_DETECT_CORE,

86
menu/menu_setting.c
View File

@ -139,10 +139,10 @@ static void setting_get_string_representation_uint_custom_viewport_width(void *d
rarch_setting_t *setting = (rarch_setting_t*)data;
if (!setting)
return;
av_info = video_viewport_get_system_av_info();
geom = (struct retro_game_geometry*)&av_info->geometry;
if (*setting->value.target.unsigned_integer%geom->base_width == 0)
snprintf(s, len, "%u (%ux)",
*setting->value.target.unsigned_integer,
@ -160,10 +160,10 @@ static void setting_get_string_representation_uint_custom_viewport_height(void *
rarch_setting_t *setting = (rarch_setting_t*)data;
if (!setting)
return;
av_info = video_viewport_get_system_av_info();
geom = (struct retro_game_geometry*)&av_info->geometry;
if (*setting->value.target.unsigned_integer%geom->base_height == 0)
snprintf(s, len, "%u (%ux)",
*setting->value.target.unsigned_integer,
@ -732,7 +732,7 @@ int menu_action_handle_setting(rarch_setting_t *setting,
return -1;
}
static rarch_setting_t *menu_setting_find_internal(rarch_setting_t *setting,
static rarch_setting_t *menu_setting_find_internal(rarch_setting_t *setting,
const char *label)
{
uint32_t needle = msg_hash_calculate(label);
@ -762,7 +762,7 @@ static rarch_setting_t *menu_setting_find_internal(rarch_setting_t *setting,
return NULL;
}
static rarch_setting_t *menu_setting_find_internal_enum(rarch_setting_t *setting,
static rarch_setting_t *menu_setting_find_internal_enum(rarch_setting_t *setting,
enum msg_hash_enums enum_idx)
{
rarch_setting_t **list = &setting;
@ -1022,10 +1022,10 @@ static int setting_action_start_libretro_device_type(void *data)
devices[types++] = RETRO_DEVICE_NONE;
devices[types++] = RETRO_DEVICE_JOYPAD;
if (runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system)
if (runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system)
&& system)
{
/* Only push RETRO_DEVICE_ANALOG as default if we use an
/* Only push RETRO_DEVICE_ANALOG as default if we use an
* older core which doesn't use SET_CONTROLLER_INFO. */
if (!system->ports.size)
devices[types++] = RETRO_DEVICE_ANALOG;
@ -1129,7 +1129,7 @@ static int setting_action_left_libretro_device_type(
if (system)
{
/* Only push RETRO_DEVICE_ANALOG as default if we use an
/* Only push RETRO_DEVICE_ANALOG as default if we use an
* older core which doesn't use SET_CONTROLLER_INFO. */
if (!system->ports.size)
devices[types++] = RETRO_DEVICE_ANALOG;
@ -1193,10 +1193,10 @@ static int setting_action_right_libretro_device_type(
devices[types++] = RETRO_DEVICE_NONE;
devices[types++] = RETRO_DEVICE_JOYPAD;
if (runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system)
if (runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system)
&& system)
{
/* Only push RETRO_DEVICE_ANALOG as default if we use an
/* Only push RETRO_DEVICE_ANALOG as default if we use an
* older core which doesn't use SET_CONTROLLER_INFO. */
if (!system->ports.size)
devices[types++] = RETRO_DEVICE_ANALOG;
@ -1337,7 +1337,7 @@ static int setting_action_ok_bind_defaults(void *data, bool wraparound)
target = (struct retro_keybind*)
&settings->input.binds[setting->index_offset][0];
def_binds = (setting->index_offset) ?
def_binds = (setting->index_offset) ?
retro_keybinds_rest : retro_keybinds_1;
if (!target)
@ -1454,7 +1454,7 @@ static void get_string_representation_bind_device(void * data, char *s,
* Get associated label of a setting.
**/
void menu_setting_get_label(void *data, char *s,
size_t len, unsigned *w, unsigned type,
size_t len, unsigned *w, unsigned type,
const char *menu_label, const char *label, unsigned idx)
{
rarch_setting_t *setting = NULL;
@ -1584,7 +1584,7 @@ void general_write_handler(void *data)
{
menu_displaylist_info_t info = {0};
info.list = menu_stack;
info.type = 0;
info.type = 0;
info.directory_ptr = 0;
strlcpy(info.label,
msg_hash_to_str(MENU_ENUM_LABEL_HELP), sizeof(info.label));
@ -1639,14 +1639,14 @@ void general_write_handler(void *data)
break;
case MENU_ENUM_LABEL_LOG_VERBOSITY:
{
if (setting
&& setting->value.target.boolean
if (setting
&& setting->value.target.boolean
&& *setting->value.target.boolean)
verbosity_enable();
else
verbosity_disable();
if (setting
if (setting
&& setting->value.target.boolean
&& *setting->value.target.boolean)
retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_VERBOSITY, NULL);
@ -1684,7 +1684,7 @@ void general_write_handler(void *data)
{
#if defined(__CELLOS_LV2__) && (CELL_SDK_VERSION > 0x340000)
cellSysutilEnableBgmPlayback();
#endif
#endif
}
else
{
@ -1718,7 +1718,7 @@ void general_write_handler(void *data)
#ifdef HAVE_NETWORKING
{
bool val = (settings->netplay.sync_frames > 0);
if (val)
retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_NETPLAY_DELAY_FRAMES, NULL);
else
@ -1976,7 +1976,7 @@ static bool setting_append_list_input_player_options(
(*list)[list_info->index - 1].action_right = &setting_action_right_libretro_device_type;
(*list)[list_info->index - 1].action_select = &setting_action_right_libretro_device_type;
(*list)[list_info->index - 1].action_start = &setting_action_start_libretro_device_type;
(*list)[list_info->index - 1].get_string_representation =
(*list)[list_info->index - 1].get_string_representation =
&setting_get_string_representation_uint_libretro_device;
menu_settings_list_current_add_enum_idx(list, list_info, (enum msg_hash_enums)(MENU_ENUM_LABEL_INPUT_LIBRETRO_DEVICE + user));
@ -1997,7 +1997,7 @@ static bool setting_append_list_input_player_options(
(*list)[list_info->index - 1].action_right = &setting_action_right_analog_dpad_mode;
(*list)[list_info->index - 1].action_select = &setting_action_right_analog_dpad_mode;
(*list)[list_info->index - 1].action_start = &setting_action_start_analog_dpad_mode;
(*list)[list_info->index - 1].get_string_representation =
(*list)[list_info->index - 1].get_string_representation =
&setting_get_string_representation_uint_analog_dpad_mode;
menu_settings_list_current_add_enum_idx(list, list_info, (enum msg_hash_enums)(MENU_ENUM_LABEL_INPUT_PLAYER_ANALOG_DPAD_MODE + user));
@ -2075,7 +2075,7 @@ static bool setting_append_list_input_player_options(
)
{
if (system->input_desc_btn[user][i])
strlcat(label,
strlcat(label,
system->input_desc_btn[user][i],
sizeof(label));
else
@ -2418,14 +2418,6 @@ static bool setting_append_list(
parent_group);
}
CONFIG_ACTION(
list, list_info,
MENU_ENUM_LABEL_CONFIGURATION_SETTINGS,
MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS,
&group_info,
&subgroup_info,
parent_group);
CONFIG_ACTION(
list, list_info,
MENU_ENUM_LABEL_SAVING_SETTINGS,
@ -2763,9 +2755,9 @@ static bool setting_append_list(
unsigned i;
struct bool_entry bool_entries[6];
START_GROUP(list, list_info, &group_info,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS), parent_group);
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS), parent_group);
parent_group = msg_hash_to_str(MENU_ENUM_LABEL_CONFIGURATION_SETTINGS);
parent_group = msg_hash_to_str(MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS);
START_SUB_GROUP(list, list_info, "State", &group_info, &subgroup_info,
parent_group);
@ -2866,7 +2858,7 @@ static bool setting_append_list(
general_write_handler,
general_read_handler);
menu_settings_list_current_add_range(list, list_info, 0, 3, 1.0, true, true);
(*list)[list_info->index - 1].get_string_representation =
(*list)[list_info->index - 1].get_string_representation =
&setting_get_string_representation_uint_libretro_log_level;
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
@ -2975,7 +2967,7 @@ static bool setting_append_list(
menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_AUTOSAVE_INIT);
menu_settings_list_current_add_range(list, list_info, 0, 0, 10, true, false);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_CMD_APPLY_AUTO);
(*list)[list_info->index - 1].get_string_representation =
(*list)[list_info->index - 1].get_string_representation =
&setting_get_string_representation_uint_autosave_interval;
#endif
@ -3100,7 +3092,7 @@ static bool setting_append_list(
general_read_handler);
menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_REINIT);
menu_settings_list_current_add_range(list, list_info, 0, 1, 1, true, false);
(*list)[list_info->index - 1].get_string_representation =
(*list)[list_info->index - 1].get_string_representation =
&setting_get_string_representation_uint_video_monitor_index;
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
@ -3169,7 +3161,7 @@ static bool setting_append_list(
(*list)[list_info->index - 1].action_start = &setting_action_start_video_refresh_rate_auto;
(*list)[list_info->index - 1].action_ok = &setting_action_ok_video_refresh_rate_auto;
(*list)[list_info->index - 1].action_select = &setting_action_ok_video_refresh_rate_auto;
(*list)[list_info->index - 1].get_string_representation =
(*list)[list_info->index - 1].get_string_representation =
&setting_get_string_representation_st_float_video_refresh_rate_auto;
if (string_is_equal(settings->video.driver, "gl"))
@ -3218,7 +3210,7 @@ static bool setting_append_list(
true,
true);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_CMD_APPLY_AUTO);
(*list)[list_info->index - 1].get_string_representation =
(*list)[list_info->index - 1].get_string_representation =
&setting_get_string_representation_uint_aspect_ratio_index;
CONFIG_INT(
@ -3396,7 +3388,7 @@ static bool setting_append_list(
general_write_handler,
general_read_handler);
menu_settings_list_current_add_range(list, list_info, 0, 3, 1, true, true);
(*list)[list_info->index - 1].get_string_representation =
(*list)[list_info->index - 1].get_string_representation =
&setting_get_string_representation_uint_video_rotation;
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
@ -3719,7 +3711,7 @@ static bool setting_append_list(
&settings->audio.latency,
MENU_ENUM_LABEL_AUDIO_LATENCY,
MENU_ENUM_LABEL_VALUE_AUDIO_LATENCY,
g_defaults.settings.out_latency ?
g_defaults.settings.out_latency ?
g_defaults.settings.out_latency : out_latency,
&group_info,
&subgroup_info,
@ -3884,7 +3876,7 @@ static bool setting_append_list(
general_write_handler,
general_read_handler);
menu_settings_list_current_add_range(list, list_info, 0, 2, 1, true, true);
#ifdef VITA
CONFIG_BOOL(
list, list_info,
@ -4101,7 +4093,7 @@ static bool setting_append_list(
general_write_handler,
general_read_handler);
menu_settings_list_current_add_range(list, list_info, 0, 1.00, 0.001, true, true);
CONFIG_UINT(
list, list_info,
&settings->input.bind_timeout,
@ -4316,7 +4308,7 @@ static bool setting_append_list(
&retro_keybinds_1[i],
&group_info, &subgroup_info, parent_group);
(*list)[list_info->index - 1].bind_type = i + MENU_SETTINGS_BIND_BEGIN;
menu_settings_list_current_add_enum_idx(list, list_info,
menu_settings_list_current_add_enum_idx(list, list_info,
(enum msg_hash_enums)(MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_BEGIN + i));
}
@ -5465,7 +5457,7 @@ static bool setting_append_list(
sizeof(settings->network.buildbot_url),
MENU_ENUM_LABEL_CORE_UPDATER_BUILDBOT_URL,
MENU_ENUM_LABEL_VALUE_CORE_UPDATER_BUILDBOT_URL,
buildbot_server_url,
buildbot_server_url,
&group_info,
&subgroup_info,
parent_group,
@ -5479,7 +5471,7 @@ static bool setting_append_list(
sizeof(settings->network.buildbot_assets_url),
MENU_ENUM_LABEL_BUILDBOT_ASSETS_URL,
MENU_ENUM_LABEL_VALUE_BUILDBOT_ASSETS_URL,
buildbot_assets_server_url,
buildbot_assets_server_url,
&group_info,
&subgroup_info,
parent_group,
@ -5843,7 +5835,7 @@ static bool setting_append_list(
true);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ALLOW_INPUT);
menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_MENU_REFRESH);
(*list)[list_info->index - 1].get_string_representation =
(*list)[list_info->index - 1].get_string_representation =
&setting_get_string_representation_uint_user_language;
#endif
@ -5908,7 +5900,7 @@ static bool setting_append_list(
parent_group,
general_write_handler,
general_read_handler);
(*list)[list_info->index - 1].get_string_representation =
(*list)[list_info->index - 1].get_string_representation =
&setting_get_string_representation_cheevos_password;
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ALLOW_INPUT);
#endif
@ -6399,7 +6391,7 @@ static rarch_setting_t *menu_setting_new_internal(rarch_setting_info_t *list_inf
{
unsigned i;
rarch_setting_t* resized_list = NULL;
enum settings_list_type list_types[] =
enum settings_list_type list_types[] =
{
SETTINGS_LIST_MAIN_MENU,
SETTINGS_LIST_DRIVERS,

11
msg_hash.h
View File

@ -937,7 +937,7 @@ enum msg_hash_enums
MENU_ENUM_LABEL_DEFERRED_INPUT_SETTINGS_LIST,
MENU_ENUM_LABEL_DEFERRED_DRIVER_SETTINGS_LIST,
MENU_ENUM_LABEL_DEFERRED_VIDEO_SETTINGS_LIST,
MENU_ENUM_LABEL_DEFERRED_CONFIGURATION_SETTINGS_LIST,
MENU_ENUM_LABEL_DEFERRED_CONFIGURATIONS_SETTINGS,
MENU_ENUM_LABEL_DEFERRED_SAVING_SETTINGS_LIST,
MENU_ENUM_LABEL_DEFERRED_FRAME_THROTTLE_SETTINGS_LIST,
MENU_ENUM_LABEL_DEFERRED_REWIND_SETTINGS_LIST,
@ -984,9 +984,6 @@ enum msg_hash_enums
MENU_ENUM_LABEL_ADD_CONTENT_LIST,
MENU_ENUM_LABEL_VALUE_ADD_CONTENT_LIST,
MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS,
MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS,
MENU_ENUM_LABEL_VALUE_DONT_CARE,
MENU_ENUM_LABEL_VALUE_LINEAR,
MENU_ENUM_LABEL_VALUE_NEAREST,
@ -1654,8 +1651,8 @@ enum msg_hash_enums
MENU_ENUM_LABEL_CORE_SETTINGS,
MENU_ENUM_LABEL_VALUE_CORE_SETTINGS,
MENU_ENUM_LABEL_CONFIGURATION_SETTINGS,
MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS,
MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS,
MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS,
MENU_ENUM_LABEL_LOGGING_SETTINGS,
MENU_ENUM_LABEL_VALUE_LOGGING_SETTINGS,
@ -1953,7 +1950,7 @@ enum msg_hash_enums
MENU_ENUM_SUBLABEL_AUDIO_SETTINGS,
MENU_ENUM_SUBLABEL_BLUETOOTH_ENABLE,
MENU_ENUM_SUBLABEL_CHEEVOS_HARDCORE_MODE_ENABLE,
MENU_ENUM_SUBLABEL_CONFIGURATION_SETTINGS,
MENU_ENUM_SUBLABEL_CONFIGURATIONS_SETTINGS,
MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT,
MENU_ENUM_SUBLABEL_CORE_SETTINGS,
MENU_ENUM_SUBLABEL_CPU_CORES,