This commit is contained in:
twinaphex 2018-09-16 21:00:04 +02:00
parent 5d4a8f4497
commit 369f8206d1
25 changed files with 168 additions and 6 deletions

View File

@ -67,15 +67,15 @@ static bool bundle_assets_extract_enable = false;
static bool materialui_icons_enable = true;
#endif
static const bool crt_switch_resolution = false;
static const bool crt_switch_resolution = false;
static const int crt_switch_resolution_super = 2560;
static const int crt_switch_center_adjust = 0;
static const bool def_history_list_enable = true;
static const bool def_playlist_entry_remove = true;
static const bool def_playlist_entry_rename = true;
static const bool def_history_list_enable = true;
static const bool def_playlist_entry_remove = true;
static const bool def_playlist_entry_rename = true;
static const unsigned int def_user_language = 0;
static const unsigned int def_user_language = 0;
#if (defined(_WIN32) && !defined(_XBOX)) || (defined(__linux) && !defined(ANDROID) && !defined(HAVE_LAKKA)) || (defined(__MACH__) && !defined(IOS)) || defined(EMSCRIPTEN)
static const bool def_mouse_enable = true;

View File

@ -1630,6 +1630,7 @@ static struct config_int_setting *populate_settings_int(settings_t *settings, in
#ifdef HAVE_WASAPI
SETTING_INT("audio_wasapi_sh_buffer_length", &settings->ints.audio_wasapi_sh_buffer_length, true, wasapi_sh_buffer_length, false);
#endif
SETTING_INT("crt_switch_center_adjust", &settings->ints.crt_switch_center_adjust, false, 0 /* TODO */, false);
*size = count;

View File

@ -322,6 +322,7 @@ typedef struct settings
int location_update_interval_distance;
int state_slot;
int audio_wasapi_sh_buffer_length;
int crt_switch_center_adjust;
} ints;
struct

View File

@ -3563,3 +3563,11 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_CRT_SWITCHRES_SETTINGS,
"Output native, low-resolution signals for use with CRT displays."
)
MSG_HASH(
MENU_ENUM_SUBLABEL_CRT_SWITCH_X_AXIS_CENTERING,
"Cycle through these options if the image is not centered properly on the display."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_CRT_SWITCH_X_AXIS_CENTERING,
"X-Axis Centering"
)

View File

@ -3347,3 +3347,11 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_CRT_SWITCHRES_SETTINGS,
"Output native, low-resolution signals for use with CRT displays."
)
MSG_HASH(
MENU_ENUM_SUBLABEL_CRT_SWITCH_X_AXIS_CENTERING,
"Cycle through these options if the image is not centered properly on the display."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_CRT_SWITCH_X_AXIS_CENTERING,
"X-Axis Centering"
)

View File

@ -3339,3 +3339,11 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_CRT_SWITCHRES_SETTINGS,
"Output native, low-resolution signals for use with CRT displays."
)
MSG_HASH(
MENU_ENUM_SUBLABEL_CRT_SWITCH_X_AXIS_CENTERING,
"Cycle through these options if the image is not centered properly on the display."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_CRT_SWITCH_X_AXIS_CENTERING,
"X-Axis Centering"
)

View File

@ -3449,3 +3449,11 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_CRT_SWITCHRES_SETTINGS,
"Output native, low-resolution signals for use with CRT displays."
)
MSG_HASH(
MENU_ENUM_SUBLABEL_CRT_SWITCH_X_AXIS_CENTERING,
"Cycle through these options if the image is not centered properly on the display."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_CRT_SWITCH_X_AXIS_CENTERING,
"X-Axis Centering"
)

View File

@ -3214,3 +3214,11 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_CRT_SWITCHRES_SETTINGS,
"Output native, low-resolution signals for use with CRT displays."
)
MSG_HASH(
MENU_ENUM_SUBLABEL_CRT_SWITCH_X_AXIS_CENTERING,
"Cycle through these options if the image is not centered properly on the display."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_CRT_SWITCH_X_AXIS_CENTERING,
"X-Axis Centering"
)

View File

@ -7461,3 +7461,11 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_CRT_SWITCHRES_SETTINGS,
"Output native, low-resolution signals for use with CRT displays."
)
MSG_HASH(
MENU_ENUM_SUBLABEL_CRT_SWITCH_X_AXIS_CENTERING,
"Cycle through these options if the image is not centered properly on the display."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_CRT_SWITCH_X_AXIS_CENTERING,
"X-Axis Centering"
)

View File

@ -3373,3 +3373,11 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_CRT_SWITCHRES_SETTINGS,
"Output native, low-resolution signals for use with CRT displays."
)
MSG_HASH(
MENU_ENUM_SUBLABEL_CRT_SWITCH_X_AXIS_CENTERING,
"Cycle through these options if the image is not centered properly on the display."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_CRT_SWITCH_X_AXIS_CENTERING,
"X-Axis Centering"
)

View File

@ -3433,3 +3433,11 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_CRT_SWITCHRES_SETTINGS,
"Emissione di segnali nativi a bassa risoluzione per l'uso con display CRT."
)
MSG_HASH(
MENU_ENUM_SUBLABEL_CRT_SWITCH_X_AXIS_CENTERING,
"Cycle through these options if the image is not centered properly on the display."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_CRT_SWITCH_X_AXIS_CENTERING,
"X-Axis Centering"
)

View File

@ -3834,3 +3834,11 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_CRT_SWITCHRES_SETTINGS,
"Output native, low-resolution signals for use with CRT displays."
)
MSG_HASH(
MENU_ENUM_SUBLABEL_CRT_SWITCH_X_AXIS_CENTERING,
"Cycle through these options if the image is not centered properly on the display."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_CRT_SWITCH_X_AXIS_CENTERING,
"X-Axis Centering"
)

View File

@ -3334,3 +3334,11 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_CRT_SWITCHRES_SETTINGS,
"Output native, low-resolution signals for use with CRT displays."
)
MSG_HASH(
MENU_ENUM_SUBLABEL_CRT_SWITCH_X_AXIS_CENTERING,
"Cycle through these options if the image is not centered properly on the display."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_CRT_SWITCH_X_AXIS_CENTERING,
"X-Axis Centering"
)

View File

@ -1147,6 +1147,8 @@ MSG_HASH(MENU_ENUM_LABEL_CRT_SWITCH_RESOLUTION,
"crt_switch_resolution")
MSG_HASH(MENU_ENUM_LABEL_CRT_SWITCH_RESOLUTION_SUPER,
"crt_switch_resolution_super")
MSG_HASH(MENU_ENUM_LABEL_CRT_SWITCH_X_AXIS_CENTERING,
"crt_switch_center_adjust")
MSG_HASH(MENU_ENUM_LABEL_VIDEO_ASPECT_RATIO,
"video_aspect_ratio")
MSG_HASH(MENU_ENUM_LABEL_VIDEO_ASPECT_RATIO_AUTO,

View File

@ -3216,3 +3216,11 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_CRT_SWITCHRES_SETTINGS,
"Output native, low-resolution signals for use with CRT displays."
)
MSG_HASH(
MENU_ENUM_SUBLABEL_CRT_SWITCH_X_AXIS_CENTERING,
"Cycle through these options if the image is not centered properly on the display."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_CRT_SWITCH_X_AXIS_CENTERING,
"X-Axis Centering"
)

View File

@ -3644,3 +3644,11 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_CRT_SWITCHRES_SETTINGS,
"Output native, low-resolution signals for use with CRT displays."
)
MSG_HASH(
MENU_ENUM_SUBLABEL_CRT_SWITCH_X_AXIS_CENTERING,
"Cycle through these options if the image is not centered properly on the display."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_CRT_SWITCH_X_AXIS_CENTERING,
"X-Axis Centering"
)

View File

@ -7460,3 +7460,11 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_CRT_SWITCHRES_SETTINGS,
"Output native, low-resolution signals for use with CRT displays."
)
MSG_HASH(
MENU_ENUM_SUBLABEL_CRT_SWITCH_X_AXIS_CENTERING,
"Cycle through these options if the image is not centered properly on the display."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_CRT_SWITCH_X_AXIS_CENTERING,
"X-Axis Centering"
)

View File

@ -3308,3 +3308,11 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_CRT_SWITCHRES_SETTINGS,
"Output native, low-resolution signals for use with CRT displays."
)
MSG_HASH(
MENU_ENUM_SUBLABEL_CRT_SWITCH_X_AXIS_CENTERING,
"Cycle through these options if the image is not centered properly on the display."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_CRT_SWITCH_X_AXIS_CENTERING,
"X-Axis Centering"
)

View File

@ -3503,3 +3503,11 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_CRT_SWITCHRES_SETTINGS,
"Output native, low-resolution signals for use with CRT displays."
)
MSG_HASH(
MENU_ENUM_SUBLABEL_CRT_SWITCH_X_AXIS_CENTERING,
"Cycle through these options if the image is not centered properly on the display."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_CRT_SWITCH_X_AXIS_CENTERING,
"X-Axis Centering"
)

View File

@ -7461,3 +7461,11 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_CRT_SWITCHRES_SETTINGS,
"Output native, low-resolution signals for use with CRT displays."
)
MSG_HASH(
MENU_ENUM_SUBLABEL_CRT_SWITCH_X_AXIS_CENTERING,
"Cycle through these options if the image is not centered properly on the display."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_CRT_SWITCH_X_AXIS_CENTERING,
"X-Axis Centering"
)

View File

@ -3371,3 +3371,11 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_CRT_SWITCHRES_SETTINGS,
"Output native, low-resolution signals for use with CRT displays."
)
MSG_HASH(
MENU_ENUM_SUBLABEL_CRT_SWITCH_X_AXIS_CENTERING,
"Cycle through these options if the image is not centered properly on the display."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_CRT_SWITCH_X_AXIS_CENTERING,
"X-Axis Centering"
)

View File

@ -69,6 +69,7 @@ default_sublabel_macro(menu_action_sublabel_setting_audio_mixer_stream_volume,
default_sublabel_macro(action_bind_sublabel_quick_menu_override_options, MENU_ENUM_SUBLABEL_QUICK_MENU_OVERRIDE_OPTIONS)
default_sublabel_macro(action_bind_sublabel_crt_switchres, MENU_ENUM_SUBLABEL_CRT_SWITCH_RESOLUTION)
default_sublabel_macro(action_bind_sublabel_crt_switchres_super, MENU_ENUM_SUBLABEL_CRT_SWITCH_RESOLUTION_SUPER)
default_sublabel_macro(action_bind_sublabel_crt_switchres_x_axis_centering, MENU_ENUM_SUBLABEL_CRT_SWITCH_X_AXIS_CENTERING)
default_sublabel_macro(action_bind_sublabel_automatically_add_content_to_playlist, MENU_ENUM_SUBLABEL_AUTOMATICALLY_ADD_CONTENT_TO_PLAYLIST)
default_sublabel_macro(action_bind_sublabel_driver_settings_list, MENU_ENUM_SUBLABEL_DRIVER_SETTINGS)
default_sublabel_macro(action_bind_sublabel_retro_achievements_settings_list, MENU_ENUM_SUBLABEL_RETRO_ACHIEVEMENTS_SETTINGS)
@ -744,6 +745,9 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
case MENU_ENUM_LABEL_CRT_SWITCH_RESOLUTION_SUPER:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_crt_switchres_super);
break;
case MENU_ENUM_LABEL_CRT_SWITCH_X_AXIS_CENTERING:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_crt_switchres_x_axis_centering);
break;
case MENU_ENUM_LABEL_AUDIO_RESAMPLER_QUALITY:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_audio_resampler_quality);
break;

View File

@ -6296,6 +6296,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_CRT_SWITCH_RESOLUTION_SUPER,
PARSE_ONLY_UINT, false);
menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_CRT_SWITCH_X_AXIS_CENTERING,
PARSE_ONLY_INT, false);
info->need_refresh = true;
info->need_push = true;

View File

@ -4591,6 +4591,20 @@ static bool setting_append_list(
(*list)[list_info->index - 1].action_left = &setting_uint_action_left_crt_switch_resolution_super;
(*list)[list_info->index - 1].action_right = &setting_uint_action_right_crt_switch_resolution_super;
CONFIG_INT(
list, list_info,
&settings->ints.crt_switch_center_adjust,
MENU_ENUM_LABEL_CRT_SWITCH_X_AXIS_CENTERING,
MENU_ENUM_LABEL_VALUE_CRT_SWITCH_X_AXIS_CENTERING,
crt_switch_center_adjust,
&group_info,
&subgroup_info,
parent_group,
general_write_handler,
general_read_handler);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
menu_settings_list_current_add_range(list, list_info, -3, 4, 1.0, true, true);
END_SUB_GROUP(list, list_info, parent_group);
END_GROUP(list, list_info, parent_group);
break;

View File

@ -696,6 +696,7 @@ enum msg_hash_enums
/* Video */
MENU_LABEL(CRT_SWITCH_RESOLUTION),
MENU_LABEL(CRT_SWITCH_RESOLUTION_SUPER),
MENU_LABEL(CRT_SWITCH_X_AXIS_CENTERING),
MENU_LABEL(VIDEO_FONT_ENABLE),
MENU_LABEL(VIDEO_FONT_PATH),
MENU_LABEL(VIDEO_FONT_SIZE),