ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(Menu) menu_displaylist_build_list - simplifications, less LOC

This commit is contained in:
libretroadmin 2023-04-23 17:30:55 +02:00
parent 07eddd7229
commit 4d2a7f4dd0
1 changed files with 154 additions and 234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

388
menu/menu_displaylist.c
View File

@ -6453,22 +6453,23 @@ unsigned menu_displaylist_build_list(
/* All other binds come last */ /* All other binds come last */
for (i = 0; i < RARCH_BIND_LIST_END; i++) for (i = 0; i < RARCH_BIND_LIST_END; i++)
{ {
uint8_t key = input_config_bind_map_get_retro_key(i);
/* Skip "Hotkey Enable" */ /* Skip "Hotkey Enable" */
if (i == RARCH_FIRST_META_KEY) if (i == RARCH_FIRST_META_KEY)
continue; continue;
/* Hidden items */ /* Hidden items */
else if (input_config_bind_map_get_retro_key(i) == RARCH_OVERLAY_NEXT else if ((key == RARCH_OVERLAY_NEXT)
|| input_config_bind_map_get_retro_key(i) == RARCH_OSK) || (key == RARCH_OSK))
continue; continue;
/* Show combo entries before normal binds */ /* Show combo entries before normal binds */
else if (input_config_bind_map_get_retro_key(i) == RARCH_MENU_TOGGLE) else if (key == RARCH_MENU_TOGGLE)
{ {
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO, MENU_ENUM_LABEL_INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO,
PARSE_ONLY_UINT, false) == 0) PARSE_ONLY_UINT, false) == 0)
count++; count++;
} }
else if (input_config_bind_map_get_retro_key(i) == RARCH_QUIT_KEY) else if (key == RARCH_QUIT_KEY)
{ {
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_INPUT_QUIT_GAMEPAD_COMBO, MENU_ENUM_LABEL_INPUT_QUIT_GAMEPAD_COMBO,
@ -6554,18 +6555,22 @@ unsigned menu_displaylist_build_list(
MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_CORE, MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_CORE,
MENU_SETTING_ACTION, 0, 0, NULL)) MENU_SETTING_ACTION, 0, 0, NULL))
count++; count++;
if (has_content && menu_entries_append(list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_PARENT), if (has_content)
msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_PARENT), {
MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_PARENT, if (menu_entries_append(list,
MENU_SETTING_ACTION, 0, 0, NULL)) msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_PARENT),
count++; msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_PARENT),
if (has_content && menu_entries_append(list, MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_PARENT,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_GAME), MENU_SETTING_ACTION, 0, 0, NULL))
msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_GAME), count++;
MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_GAME, if (menu_entries_append(list,
MENU_SETTING_ACTION, 0, 0, NULL)) msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_GAME),
count++; msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_GAME),
MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_GAME,
MENU_SETTING_ACTION, 0, 0, NULL))
count++;
}
#endif #endif
} }
break; break;
@ -6784,52 +6789,51 @@ unsigned menu_displaylist_build_list(
count++; count++;
break; break;
case DISPLAYLIST_AUDIO_OUTPUT_SETTINGS_LIST: case DISPLAYLIST_AUDIO_OUTPUT_SETTINGS_LIST:
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, {
MENU_ENUM_LABEL_AUDIO_ENABLE, menu_displaylist_build_info_selective_t build_list[] = {
PARSE_ONLY_BOOL, false) == 0) {MENU_ENUM_LABEL_AUDIO_ENABLE, PARSE_ONLY_BOOL, true },
count++; {MENU_ENUM_LABEL_AUDIO_DRIVER, PARSE_ONLY_STRING_OPTIONS, true },
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, {MENU_ENUM_LABEL_AUDIO_DEVICE, PARSE_ONLY_STRING, true },
MENU_ENUM_LABEL_AUDIO_DRIVER, {MENU_ENUM_LABEL_AUDIO_LATENCY, PARSE_ONLY_UINT, true },
PARSE_ONLY_STRING_OPTIONS, false) == 0) #ifdef _WIN32
count++; {MENU_ENUM_LABEL_AUDIO_WASAPI_EXCLUSIVE_MODE, PARSE_ONLY_BOOL, true },
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, {MENU_ENUM_LABEL_AUDIO_WASAPI_FLOAT_FORMAT, PARSE_ONLY_BOOL, true },
MENU_ENUM_LABEL_AUDIO_DEVICE, {MENU_ENUM_LABEL_AUDIO_WASAPI_SH_BUFFER_LENGTH, PARSE_ONLY_INT, true },
PARSE_ONLY_STRING, false) == 0) #endif
count++; {MENU_ENUM_LABEL_AUDIO_BLOCK_FRAMES, PARSE_ONLY_UINT, true },
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, };
MENU_ENUM_LABEL_AUDIO_LATENCY,
PARSE_ONLY_UINT, false) == 0) for (i = 0; i < ARRAY_SIZE(build_list); i++)
count++; {
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, if (!build_list[i].checked && !include_everything)
MENU_ENUM_LABEL_AUDIO_WASAPI_EXCLUSIVE_MODE, continue;
PARSE_ONLY_BOOL, false) == 0)
count++; if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, build_list[i].enum_idx, build_list[i].parse_type,
MENU_ENUM_LABEL_AUDIO_WASAPI_FLOAT_FORMAT, false) == 0)
PARSE_ONLY_BOOL, false) == 0) count++;
count++; }
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, }
MENU_ENUM_LABEL_AUDIO_WASAPI_SH_BUFFER_LENGTH,
PARSE_ONLY_INT, false) == 0)
count++;
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_AUDIO_BLOCK_FRAMES,
PARSE_ONLY_UINT, false) == 0)
count++;
break; break;
case DISPLAYLIST_AUDIO_SYNCHRONIZATION_SETTINGS_LIST: case DISPLAYLIST_AUDIO_SYNCHRONIZATION_SETTINGS_LIST:
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, {
MENU_ENUM_LABEL_AUDIO_SYNC, menu_displaylist_build_info_selective_t build_list[] = {
PARSE_ONLY_BOOL, false) == 0) {MENU_ENUM_LABEL_AUDIO_SYNC, PARSE_ONLY_BOOL, true },
count++; {MENU_ENUM_LABEL_AUDIO_MAX_TIMING_SKEW, PARSE_ONLY_FLOAT, true },
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, {MENU_ENUM_LABEL_AUDIO_RATE_CONTROL_DELTA, PARSE_ONLY_FLOAT, true },
MENU_ENUM_LABEL_AUDIO_MAX_TIMING_SKEW, };
PARSE_ONLY_FLOAT, false) == 0)
count++; for (i = 0; i < ARRAY_SIZE(build_list); i++)
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, {
MENU_ENUM_LABEL_AUDIO_RATE_CONTROL_DELTA, if (!build_list[i].checked && !include_everything)
PARSE_ONLY_FLOAT, false) == 0) continue;
count++;
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
build_list[i].enum_idx, build_list[i].parse_type,
false) == 0)
count++;
}
}
break; break;
case DISPLAYLIST_AUDIO_SETTINGS_LIST: case DISPLAYLIST_AUDIO_SETTINGS_LIST:
{ {
@ -7156,172 +7160,88 @@ unsigned menu_displaylist_build_list(
#endif #endif
break; break;
case DISPLAYLIST_INPUT_MENU_SETTINGS_LIST: case DISPLAYLIST_INPUT_MENU_SETTINGS_LIST:
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, {
MENU_ENUM_LABEL_INPUT_UNIFIED_MENU_CONTROLS, menu_displaylist_build_info_selective_t build_list[] = {
PARSE_ONLY_BOOL, false) == 0) {MENU_ENUM_LABEL_INPUT_UNIFIED_MENU_CONTROLS, PARSE_ONLY_BOOL, true },
count++; {MENU_ENUM_LABEL_MENU_INPUT_SWAP_OK_CANCEL, PARSE_ONLY_BOOL, true },
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, {MENU_ENUM_LABEL_MENU_INPUT_SWAP_SCROLL, PARSE_ONLY_BOOL, true },
MENU_ENUM_LABEL_MENU_INPUT_SWAP_OK_CANCEL, {MENU_ENUM_LABEL_INPUT_ALL_USERS_CONTROL_MENU, PARSE_ONLY_BOOL, true },
PARSE_ONLY_BOOL, false) == 0) {MENU_ENUM_LABEL_MENU_SCROLL_FAST, PARSE_ONLY_BOOL, true },
count++; {MENU_ENUM_LABEL_MENU_SCROLL_DELAY, PARSE_ONLY_UINT, true },
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, {MENU_ENUM_LABEL_INPUT_DISABLE_INFO_BUTTON, PARSE_ONLY_BOOL, true },
MENU_ENUM_LABEL_MENU_INPUT_SWAP_SCROLL, {MENU_ENUM_LABEL_INPUT_DISABLE_SEARCH_BUTTON, PARSE_ONLY_BOOL, true },
PARSE_ONLY_BOOL, false) == 0) };
count++;
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_INPUT_ALL_USERS_CONTROL_MENU,
PARSE_ONLY_BOOL, false) == 0)
count++;
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_MENU_SCROLL_FAST,
PARSE_ONLY_BOOL, false) == 0)
count++;
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_MENU_SCROLL_DELAY,
PARSE_ONLY_UINT, false) == 0)
count++;
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_INPUT_DISABLE_INFO_BUTTON,
PARSE_ONLY_BOOL, false) == 0)
count++;
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_INPUT_DISABLE_SEARCH_BUTTON,
PARSE_ONLY_BOOL, false) == 0)
count++;
for (i = 0; i < ARRAY_SIZE(build_list); i++)
{
if (!build_list[i].checked && !include_everything)
continue;
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
build_list[i].enum_idx, build_list[i].parse_type,
false) == 0)
count++;
}
}
break; break;
case DISPLAYLIST_INPUT_SETTINGS_LIST: case DISPLAYLIST_INPUT_SETTINGS_LIST:
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, {
MENU_ENUM_LABEL_INPUT_MAX_USERS, menu_displaylist_build_info_selective_t build_list[] = {
PARSE_ONLY_UINT, false) == 0) {MENU_ENUM_LABEL_INPUT_MAX_USERS, PARSE_ONLY_UINT, true },
count++; {MENU_ENUM_LABEL_INPUT_POLL_TYPE_BEHAVIOR, PARSE_ONLY_UINT, true },
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, {MENU_ENUM_LABEL_INPUT_ICADE_ENABLE, PARSE_ONLY_BOOL, true },
MENU_ENUM_LABEL_INPUT_POLL_TYPE_BEHAVIOR, {MENU_ENUM_LABEL_INPUT_SMALL_KEYBOARD_ENABLE, PARSE_ONLY_BOOL, true },
PARSE_ONLY_UINT, false) == 0) {MENU_ENUM_LABEL_INPUT_KEYBOARD_GAMEPAD_MAPPING_TYPE, PARSE_ONLY_UINT, true },
count++; {MENU_ENUM_LABEL_INPUT_TOUCH_ENABLE, PARSE_ONLY_BOOL, true },
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, {MENU_ENUM_LABEL_INPUT_PREFER_FRONT_TOUCH, PARSE_ONLY_BOOL, true },
MENU_ENUM_LABEL_INPUT_ICADE_ENABLE, {MENU_ENUM_LABEL_INPUT_REMAP_BINDS_ENABLE, PARSE_ONLY_BOOL, true },
PARSE_ONLY_BOOL, false) == 0) {MENU_ENUM_LABEL_INPUT_AUTODETECT_ENABLE, PARSE_ONLY_BOOL, true },
count++; {MENU_ENUM_LABEL_PAUSE_ON_DISCONNECT, PARSE_ONLY_BOOL, true },
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, {MENU_ENUM_LABEL_INPUT_DESCRIPTOR_LABEL_SHOW, PARSE_ONLY_BOOL, true },
MENU_ENUM_LABEL_INPUT_SMALL_KEYBOARD_ENABLE, {MENU_ENUM_LABEL_INPUT_DESCRIPTOR_HIDE_UNBOUND, PARSE_ONLY_BOOL, true },
PARSE_ONLY_BOOL, false) == 0) {MENU_ENUM_LABEL_INPUT_BUTTON_AXIS_THRESHOLD, PARSE_ONLY_FLOAT, true },
count++; {MENU_ENUM_LABEL_INPUT_ANALOG_DEADZONE, PARSE_ONLY_FLOAT, true },
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, {MENU_ENUM_LABEL_INPUT_ANALOG_SENSITIVITY, PARSE_ONLY_FLOAT, true },
MENU_ENUM_LABEL_INPUT_KEYBOARD_GAMEPAD_MAPPING_TYPE,
PARSE_ONLY_UINT, false) == 0)
count++;
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_INPUT_TOUCH_ENABLE,
PARSE_ONLY_BOOL, false) == 0)
count++;
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_INPUT_PREFER_FRONT_TOUCH,
PARSE_ONLY_BOOL, false) == 0)
count++;
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_INPUT_REMAP_BINDS_ENABLE,
PARSE_ONLY_BOOL, false) == 0)
count++;
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_INPUT_AUTODETECT_ENABLE,
PARSE_ONLY_BOOL, false) == 0)
count++;
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_PAUSE_ON_DISCONNECT,
PARSE_ONLY_BOOL, false) == 0)
count++;
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_INPUT_DESCRIPTOR_LABEL_SHOW,
PARSE_ONLY_BOOL, false) == 0)
count++;
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_INPUT_DESCRIPTOR_HIDE_UNBOUND,
PARSE_ONLY_BOOL, false) == 0)
count++;
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_INPUT_BUTTON_AXIS_THRESHOLD,
PARSE_ONLY_FLOAT, false) == 0)
count++;
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_INPUT_ANALOG_DEADZONE,
PARSE_ONLY_FLOAT, false) == 0)
count++;
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_INPUT_ANALOG_SENSITIVITY,
PARSE_ONLY_FLOAT, false) == 0)
count++;
#if defined(GEKKO) #if defined(GEKKO)
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, {MENU_ENUM_LABEL_INPUT_MOUSE_SCALE, PARSE_ONLY_UINT, true },
MENU_ENUM_LABEL_INPUT_MOUSE_SCALE,
PARSE_ONLY_UINT, false) == 0)
count++;
#endif #endif
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, {MENU_ENUM_LABEL_INPUT_TOUCH_SCALE, PARSE_ONLY_UINT, true },
MENU_ENUM_LABEL_INPUT_TOUCH_SCALE, {MENU_ENUM_LABEL_INPUT_BIND_TIMEOUT, PARSE_ONLY_UINT, true },
PARSE_ONLY_UINT, false) == 0) {MENU_ENUM_LABEL_INPUT_BIND_HOLD, PARSE_ONLY_UINT, true },
count++; {MENU_ENUM_LABEL_INPUT_BIND_MODE, PARSE_ONLY_UINT, true },
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, {MENU_ENUM_LABEL_QUIT_PRESS_TWICE, PARSE_ONLY_BOOL, true },
MENU_ENUM_LABEL_INPUT_BIND_TIMEOUT,
PARSE_ONLY_UINT, false) == 0)
count++;
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_INPUT_BIND_HOLD,
PARSE_ONLY_UINT, false) == 0)
count++;
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_INPUT_BIND_MODE,
PARSE_ONLY_UINT, false) == 0)
count++;
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_QUIT_PRESS_TWICE,
PARSE_ONLY_BOOL, false) == 0)
count++;
#if defined(HAVE_DINPUT) || defined(HAVE_WINRAWINPUT) #if defined(HAVE_DINPUT) || defined(HAVE_WINRAWINPUT)
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, {MENU_ENUM_LABEL_INPUT_NOWINKEY_ENABLE, PARSE_ONLY_BOOL, true },
MENU_ENUM_LABEL_INPUT_NOWINKEY_ENABLE,
PARSE_ONLY_BOOL, false) == 0)
count++;
#endif #endif
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, {MENU_ENUM_LABEL_INPUT_AUTO_MOUSE_GRAB, PARSE_ONLY_BOOL, true },
MENU_ENUM_LABEL_INPUT_AUTO_MOUSE_GRAB, {MENU_ENUM_LABEL_INPUT_AUTO_GAME_FOCUS, PARSE_ONLY_UINT, true },
PARSE_ONLY_BOOL, false) == 0) {MENU_ENUM_LABEL_INPUT_SENSORS_ENABLE, PARSE_ONLY_BOOL, true },
count++; {MENU_ENUM_LABEL_INPUT_HAPTIC_FEEDBACK_SETTINGS, PARSE_ACTION, true },
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, {MENU_ENUM_LABEL_INPUT_MENU_SETTINGS, PARSE_ACTION, true },
MENU_ENUM_LABEL_INPUT_AUTO_GAME_FOCUS, {MENU_ENUM_LABEL_INPUT_HOTKEY_BINDS, PARSE_ACTION, true },
PARSE_ONLY_UINT, false) == 0) {MENU_ENUM_LABEL_INPUT_TURBO_FIRE_SETTINGS, PARSE_ACTION, true },
count++;
#ifdef ANDROID #ifdef ANDROID
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, {MENU_ENUM_LABEL_ANDROID_INPUT_DISCONNECT_WORKAROUND, PARSE_ONLY_BOOL, true },
MENU_ENUM_LABEL_ANDROID_INPUT_DISCONNECT_WORKAROUND, #endif
PARSE_ONLY_BOOL, false) == 0) };
count++;
for (i = 0; i < ARRAY_SIZE(build_list); i++)
{
if (!build_list[i].checked && !include_everything)
continue;
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
build_list[i].enum_idx, build_list[i].parse_type,
false) == 0)
count++;
}
}
#ifdef ANDROID
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_INPUT_SELECT_PHYSICAL_KEYBOARD, MENU_ENUM_LABEL_INPUT_SELECT_PHYSICAL_KEYBOARD,
PARSE_ACTION, true) == 0) PARSE_ACTION, true) == 0)
count++; count++;
#endif #endif
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_INPUT_SENSORS_ENABLE,
PARSE_ONLY_BOOL, false) == 0)
count++;
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_INPUT_HAPTIC_FEEDBACK_SETTINGS,
PARSE_ACTION, false) == 0)
count++;
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_INPUT_MENU_SETTINGS,
PARSE_ACTION, false) == 0)
count++;
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_INPUT_HOTKEY_BINDS,
PARSE_ACTION, false) == 0)
count++;
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_INPUT_TURBO_FIRE_SETTINGS,
PARSE_ACTION, false) == 0)
count++;
#ifdef HAVE_LIBNX #ifdef HAVE_LIBNX
{ {
@ -8810,28 +8730,28 @@ unsigned menu_displaylist_build_list(
} }
break; break;
case DISPLAYLIST_VIDEO_FULLSCREEN_MODE_SETTINGS_LIST: case DISPLAYLIST_VIDEO_FULLSCREEN_MODE_SETTINGS_LIST:
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, {
MENU_ENUM_LABEL_VIDEO_FULLSCREEN, menu_displaylist_build_info_selective_t build_list[] = {
PARSE_ONLY_BOOL, false) == 0) {MENU_ENUM_LABEL_VIDEO_FULLSCREEN, PARSE_ONLY_BOOL, true },
count++; {MENU_ENUM_LABEL_VIDEO_WINDOWED_FULLSCREEN, PARSE_ONLY_BOOL, true },
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, {MENU_ENUM_LABEL_VIDEO_FULLSCREEN_X, PARSE_ONLY_UINT, true },
MENU_ENUM_LABEL_VIDEO_WINDOWED_FULLSCREEN, {MENU_ENUM_LABEL_VIDEO_FULLSCREEN_Y, PARSE_ONLY_UINT, true },
PARSE_ONLY_BOOL, false) == 0)
count++;
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_VIDEO_FULLSCREEN_X,
PARSE_ONLY_UINT, false) == 0)
count++;
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_VIDEO_FULLSCREEN_Y,
PARSE_ONLY_UINT, false) == 0)
count++;
#ifdef __WINRT__ #ifdef __WINRT__
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, {MENU_ENUM_LABEL_VIDEO_FORCE_RESOLUTION, PARSE_ONLY_BOOL, true },
MENU_ENUM_LABEL_VIDEO_FORCE_RESOLUTION,
PARSE_ONLY_BOOL, false) == 0)
count++;
#endif #endif
};
for (i = 0; i < ARRAY_SIZE(build_list); i++)
{
if (!build_list[i].checked && !include_everything)
continue;
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
build_list[i].enum_idx, build_list[i].parse_type,
false) == 0)
count++;
}
}
break; break;
case DISPLAYLIST_VIDEO_OUTPUT_SETTINGS_LIST: case DISPLAYLIST_VIDEO_OUTPUT_SETTINGS_LIST:
{ {
@ -9761,8 +9681,8 @@ unsigned menu_displaylist_build_list(
case DISPLAYLIST_PRIVACY_SETTINGS_LIST: case DISPLAYLIST_PRIVACY_SETTINGS_LIST:
{ {
menu_displaylist_build_info_t build_list[] = { menu_displaylist_build_info_t build_list[] = {
{MENU_ENUM_LABEL_CAMERA_ALLOW, PARSE_ONLY_BOOL}, {MENU_ENUM_LABEL_CAMERA_ALLOW, PARSE_ONLY_BOOL},
{MENU_ENUM_LABEL_DISCORD_ALLOW, PARSE_ONLY_BOOL}, {MENU_ENUM_LABEL_DISCORD_ALLOW, PARSE_ONLY_BOOL},
{MENU_ENUM_LABEL_LOCATION_ALLOW, PARSE_ONLY_BOOL}, {MENU_ENUM_LABEL_LOCATION_ALLOW, PARSE_ONLY_BOOL},
}; };