diff --git a/intl/msg_hash_lbl.h b/intl/msg_hash_lbl.h index 5c300977fd..573d94214c 100644 --- a/intl/msg_hash_lbl.h +++ b/intl/msg_hash_lbl.h @@ -431,6 +431,8 @@ MSG_HASH(MENU_ENUM_LABEL_DEFERRED_VIDEO_FILTER, "deferred_video_filter") MSG_HASH(MENU_ENUM_LABEL_DEFERRED_VIDEO_SETTINGS_LIST, "deferred_video_settings_list") +MSG_HASH(MENU_ENUM_LABEL_DEFERRED_VIDEO_SCALING_SETTINGS_LIST, + "deferred_video_scaling_settings_list") MSG_HASH(MENU_ENUM_LABEL_DEFERRED_CRT_SWITCHRES_SETTINGS_LIST, "deferred_crt_switchres_settings_list") MSG_HASH(MENU_ENUM_LABEL_DEFERRED_WIFI_SETTINGS_LIST, @@ -1405,6 +1407,8 @@ MSG_HASH(MENU_ENUM_LABEL_VIDEO_SCALE_INTEGER, "video_scale_integer") MSG_HASH(MENU_ENUM_LABEL_VIDEO_SETTINGS, "video_settings") +MSG_HASH(MENU_ENUM_LABEL_VIDEO_SCALING_SETTINGS, + "video_scaling_settings") MSG_HASH(MENU_ENUM_LABEL_CRT_SWITCHRES_SETTINGS, "crt_switchres_settings") MSG_HASH(MENU_ENUM_LABEL_VIDEO_SHADER_DIR, diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 68dcf87841..ec60879d2e 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -10196,3 +10196,11 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_ACCESSIBILITY_NARRATOR_SPEECH_SPEED, "Narrator Speech Speed" ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_VIDEO_SCALING_SETTINGS, + "Scaling" + ) +MSG_HASH( + MENU_ENUM_SUBLABEL_VIDEO_SCALING_SETTINGS, + "Change video scaling settings." + ) diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c index ebaba319f7..1097bd630e 100644 --- a/menu/cbs/menu_cbs_deferred_push.c +++ b/menu/cbs/menu_cbs_deferred_push.c @@ -145,6 +145,7 @@ generic_deferred_push(deferred_push_accounts_list, DISPLAYLIST_ generic_deferred_push(deferred_push_driver_settings_list, DISPLAYLIST_DRIVER_SETTINGS_LIST) generic_deferred_push(deferred_push_core_settings_list, DISPLAYLIST_CORE_SETTINGS_LIST) generic_deferred_push(deferred_push_video_settings_list, DISPLAYLIST_VIDEO_SETTINGS_LIST) +generic_deferred_push(deferred_push_video_scaling_settings_list, DISPLAYLIST_VIDEO_SCALING_SETTINGS_LIST) generic_deferred_push(deferred_push_crt_switchres_settings_list, DISPLAYLIST_CRT_SWITCHRES_SETTINGS_LIST) generic_deferred_push(deferred_push_configuration_settings_list, DISPLAYLIST_CONFIGURATION_SETTINGS_LIST) generic_deferred_push(deferred_push_saving_settings_list, DISPLAYLIST_SAVING_SETTINGS_LIST) @@ -723,6 +724,7 @@ static int menu_cbs_init_bind_deferred_push_compare_label( {MENU_ENUM_LABEL_DEFERRED_NETPLAY, deferred_push_netplay_sublist}, {MENU_ENUM_LABEL_DEFERRED_DRIVER_SETTINGS_LIST, deferred_push_driver_settings_list}, {MENU_ENUM_LABEL_DEFERRED_VIDEO_SETTINGS_LIST, deferred_push_video_settings_list}, + {MENU_ENUM_LABEL_DEFERRED_VIDEO_SCALING_SETTINGS_LIST, deferred_push_video_scaling_settings_list}, {MENU_ENUM_LABEL_DEFERRED_CRT_SWITCHRES_SETTINGS_LIST, deferred_push_crt_switchres_settings_list}, {MENU_ENUM_LABEL_DEFERRED_AUDIO_SETTINGS_LIST, deferred_push_audio_settings_list}, {MENU_ENUM_LABEL_DEFERRED_AUDIO_MIXER_SETTINGS_LIST, deferred_push_audio_mixer_settings_list}, @@ -1055,6 +1057,9 @@ 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_VIDEO_SCALING_SETTINGS_LIST: + BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_video_scaling_settings_list); + break; case MENU_ENUM_LABEL_DEFERRED_CRT_SWITCHRES_SETTINGS_LIST: BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_crt_switchres_settings_list); break; diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index 476aa8d1aa..9db76f35d8 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -202,6 +202,8 @@ static enum msg_hash_enums action_ok_dl_to_enum(unsigned lbl) return MENU_ENUM_LABEL_DEFERRED_CORE_SETTINGS_LIST; case ACTION_OK_DL_VIDEO_SETTINGS_LIST: return MENU_ENUM_LABEL_DEFERRED_VIDEO_SETTINGS_LIST; + case ACTION_OK_DL_VIDEO_SCALING_SETTINGS_LIST: + return MENU_ENUM_LABEL_DEFERRED_VIDEO_SCALING_SETTINGS_LIST; case ACTION_OK_DL_CRT_SWITCHRES_SETTINGS_LIST: return MENU_ENUM_LABEL_DEFERRED_CRT_SWITCHRES_SETTINGS_LIST; case ACTION_OK_DL_CONFIGURATION_SETTINGS_LIST: @@ -1011,6 +1013,7 @@ int generic_action_ok_displaylist_push(const char *path, case ACTION_OK_DL_DRIVER_SETTINGS_LIST: case ACTION_OK_DL_CORE_SETTINGS_LIST: case ACTION_OK_DL_VIDEO_SETTINGS_LIST: + case ACTION_OK_DL_VIDEO_SCALING_SETTINGS_LIST: case ACTION_OK_DL_CRT_SWITCHRES_SETTINGS_LIST: case ACTION_OK_DL_CONFIGURATION_SETTINGS_LIST: case ACTION_OK_DL_SAVING_SETTINGS_LIST: @@ -4727,6 +4730,7 @@ default_action_ok_func(action_ok_push_accounts_list, ACTION_OK_DL_ACCOUNTS_LIST) default_action_ok_func(action_ok_push_driver_settings_list, ACTION_OK_DL_DRIVER_SETTINGS_LIST) default_action_ok_func(action_ok_push_crt_switchres_settings_list, ACTION_OK_DL_CRT_SWITCHRES_SETTINGS_LIST) default_action_ok_func(action_ok_push_video_settings_list, ACTION_OK_DL_VIDEO_SETTINGS_LIST) +default_action_ok_func(action_ok_push_video_scaling_settings_list, ACTION_OK_DL_VIDEO_SCALING_SETTINGS_LIST) default_action_ok_func(action_ok_push_configuration_settings_list, ACTION_OK_DL_CONFIGURATION_SETTINGS_LIST) default_action_ok_func(action_ok_push_core_settings_list, ACTION_OK_DL_CORE_SETTINGS_LIST) default_action_ok_func(action_ok_push_audio_settings_list, ACTION_OK_DL_AUDIO_SETTINGS_LIST) @@ -6381,6 +6385,9 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_VIDEO_SETTINGS: BIND_ACTION_OK(cbs, action_ok_push_video_settings_list); break; + case MENU_ENUM_LABEL_VIDEO_SCALING_SETTINGS: + BIND_ACTION_OK(cbs, action_ok_push_video_scaling_settings_list); + break; case MENU_ENUM_LABEL_CRT_SWITCHRES_SETTINGS: BIND_ACTION_OK(cbs, action_ok_push_crt_switchres_settings_list); break; diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index 11f433c24d..6fb331df41 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -172,6 +172,7 @@ default_sublabel_macro(action_bind_sublabel_quick_menu_views_settings_list, MENU default_sublabel_macro(action_bind_sublabel_settings_views_settings_list, MENU_ENUM_SUBLABEL_SETTINGS_VIEWS_SETTINGS) default_sublabel_macro(action_bind_sublabel_menu_settings_list, MENU_ENUM_SUBLABEL_MENU_SETTINGS) default_sublabel_macro(action_bind_sublabel_video_settings_list, MENU_ENUM_SUBLABEL_VIDEO_SETTINGS) +default_sublabel_macro(action_bind_sublabel_video_scaling_settings_list, MENU_ENUM_SUBLABEL_VIDEO_SCALING_SETTINGS) default_sublabel_macro(action_bind_sublabel_crt_switchres_settings_list, MENU_ENUM_SUBLABEL_CRT_SWITCHRES_SETTINGS) default_sublabel_macro(action_bind_sublabel_suspend_screensaver_enable, MENU_ENUM_SUBLABEL_SUSPEND_SCREENSAVER_ENABLE) default_sublabel_macro(action_bind_sublabel_video_window_scale, MENU_ENUM_SUBLABEL_VIDEO_WINDOW_SCALE) @@ -2695,6 +2696,9 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_VIDEO_SETTINGS: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_video_settings_list); break; + case MENU_ENUM_LABEL_VIDEO_SCALING_SETTINGS: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_video_scaling_settings_list); + break; case MENU_ENUM_LABEL_CRT_SWITCHRES_SETTINGS: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_crt_switchres_settings_list); break; diff --git a/menu/menu_cbs.h b/menu/menu_cbs.h index e3f49752e9..e444384d27 100644 --- a/menu/menu_cbs.h +++ b/menu/menu_cbs.h @@ -82,6 +82,7 @@ enum ACTION_OK_DL_INPUT_SETTINGS_LIST, ACTION_OK_DL_DRIVER_SETTINGS_LIST, ACTION_OK_DL_VIDEO_SETTINGS_LIST, + ACTION_OK_DL_VIDEO_SCALING_SETTINGS_LIST, ACTION_OK_DL_CRT_SWITCHRES_SETTINGS_LIST, ACTION_OK_DL_AUDIO_SETTINGS_LIST, ACTION_OK_DL_AUDIO_MIXER_SETTINGS_LIST, diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index c62b319333..6d8118e082 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -4230,28 +4230,8 @@ unsigned menu_displaylist_build_list(file_list_t *list, enum menu_displaylist_ct PARSE_ONLY_BOOL, false) == 0) count++; if (menu_displaylist_parse_settings_enum(list, - MENU_ENUM_LABEL_VIDEO_ASPECT_RATIO_INDEX, - PARSE_ONLY_UINT, false) == 0) - count++; - if (menu_displaylist_parse_settings_enum(list, - MENU_ENUM_LABEL_VIDEO_ASPECT_RATIO, - PARSE_ONLY_FLOAT, false) == 0) - count++; - if (menu_displaylist_parse_settings_enum(list, - MENU_ENUM_LABEL_VIDEO_VIEWPORT_CUSTOM_X, - PARSE_ONLY_INT, false) == 0) - count++; - if (menu_displaylist_parse_settings_enum(list, - MENU_ENUM_LABEL_VIDEO_VIEWPORT_CUSTOM_Y, - PARSE_ONLY_INT, false) == 0) - count++; - if (menu_displaylist_parse_settings_enum(list, - MENU_ENUM_LABEL_VIDEO_VIEWPORT_CUSTOM_WIDTH, - PARSE_ONLY_UINT, false) == 0) - count++; - if (menu_displaylist_parse_settings_enum(list, - MENU_ENUM_LABEL_VIDEO_VIEWPORT_CUSTOM_HEIGHT, - PARSE_ONLY_UINT, false) == 0) + MENU_ENUM_LABEL_VIDEO_SCALING_SETTINGS, + PARSE_ACTION, false) == 0) count++; if (menu_displaylist_parse_settings_enum(list, MENU_ENUM_LABEL_VIDEO_SCALE, @@ -4277,10 +4257,6 @@ unsigned menu_displaylist_build_list(file_list_t *list, enum menu_displaylist_ct MENU_ENUM_LABEL_VIDEO_WINDOW_HEIGHT, PARSE_ONLY_UINT, false) == 0) count++; - if (menu_displaylist_parse_settings_enum(list, - MENU_ENUM_LABEL_VIDEO_SCALE_INTEGER, - PARSE_ONLY_BOOL, false) == 0) - count++; if (menu_displaylist_parse_settings_enum(list, MENU_ENUM_LABEL_VIDEO_VI_WIDTH, PARSE_ONLY_UINT, false) == 0) @@ -5668,6 +5644,36 @@ unsigned menu_displaylist_build_list(file_list_t *list, enum menu_displaylist_ct } } break; + case DISPLAYLIST_VIDEO_SCALING_SETTINGS_LIST: + if (menu_displaylist_parse_settings_enum(list, + MENU_ENUM_LABEL_VIDEO_SCALE_INTEGER, + PARSE_ONLY_BOOL, false) == 0) + count++; + if (menu_displaylist_parse_settings_enum(list, + MENU_ENUM_LABEL_VIDEO_ASPECT_RATIO_INDEX, + PARSE_ONLY_UINT, false) == 0) + count++; + if (menu_displaylist_parse_settings_enum(list, + MENU_ENUM_LABEL_VIDEO_ASPECT_RATIO, + PARSE_ONLY_FLOAT, false) == 0) + count++; + if (menu_displaylist_parse_settings_enum(list, + MENU_ENUM_LABEL_VIDEO_VIEWPORT_CUSTOM_X, + PARSE_ONLY_INT, false) == 0) + count++; + if (menu_displaylist_parse_settings_enum(list, + MENU_ENUM_LABEL_VIDEO_VIEWPORT_CUSTOM_Y, + PARSE_ONLY_INT, false) == 0) + count++; + if (menu_displaylist_parse_settings_enum(list, + MENU_ENUM_LABEL_VIDEO_VIEWPORT_CUSTOM_WIDTH, + PARSE_ONLY_UINT, false) == 0) + count++; + if (menu_displaylist_parse_settings_enum(list, + MENU_ENUM_LABEL_VIDEO_VIEWPORT_CUSTOM_HEIGHT, + PARSE_ONLY_UINT, false) == 0) + count++; + break; case DISPLAYLIST_CRT_SWITCHRES_SETTINGS_LIST: { menu_displaylist_build_info_t build_list[] = { @@ -8206,6 +8212,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, case DISPLAYLIST_LAKKA_SERVICES_LIST: case DISPLAYLIST_MIDI_SETTINGS_LIST: case DISPLAYLIST_CRT_SWITCHRES_SETTINGS_LIST: + case DISPLAYLIST_VIDEO_SCALING_SETTINGS_LIST: case DISPLAYLIST_OPTIONS_DISK: case DISPLAYLIST_AI_SERVICE_SETTINGS_LIST: case DISPLAYLIST_ACCESSIBILITY_SETTINGS_LIST: diff --git a/menu/menu_displaylist.h b/menu/menu_displaylist.h index 29161089af..7f0134a295 100644 --- a/menu/menu_displaylist.h +++ b/menu/menu_displaylist.h @@ -135,6 +135,7 @@ enum menu_displaylist_ctl_state DISPLAYLIST_ACCOUNTS_LIST, DISPLAYLIST_MIXER_STREAM_SETTINGS_LIST, DISPLAYLIST_DRIVER_SETTINGS_LIST, + DISPLAYLIST_VIDEO_SCALING_SETTINGS_LIST, DISPLAYLIST_CRT_SWITCHRES_SETTINGS_LIST, DISPLAYLIST_VIDEO_SETTINGS_LIST, DISPLAYLIST_CONFIGURATION_SETTINGS_LIST, diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 3c0c5aad43..0afe6628fc 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -9657,6 +9657,14 @@ static bool setting_append_list( END_SUB_GROUP(list, list_info, parent_group); START_SUB_GROUP(list, list_info, "Scaling", &group_info, &subgroup_info, parent_group); + CONFIG_ACTION( + list, list_info, + MENU_ENUM_LABEL_VIDEO_SCALING_SETTINGS, + MENU_ENUM_LABEL_VALUE_VIDEO_SCALING_SETTINGS, + &group_info, + &subgroup_info, + parent_group); + if (video_driver_has_windowed()) { CONFIG_FLOAT( diff --git a/msg_hash.h b/msg_hash.h index ab15202ee9..8fb1a2f875 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -1305,6 +1305,7 @@ enum msg_hash_enums MENU_ENUM_LABEL_DEFERRED_LATENCY_SETTINGS_LIST, MENU_ENUM_LABEL_DEFERRED_DRIVER_SETTINGS_LIST, MENU_ENUM_LABEL_DEFERRED_VIDEO_SETTINGS_LIST, + MENU_ENUM_LABEL_DEFERRED_VIDEO_SCALING_SETTINGS_LIST, MENU_ENUM_LABEL_DEFERRED_CRT_SWITCHRES_SETTINGS_LIST, MENU_ENUM_LABEL_DEFERRED_CONFIGURATION_SETTINGS_LIST, MENU_ENUM_LABEL_DEFERRED_SAVING_SETTINGS_LIST, @@ -1929,6 +1930,7 @@ enum msg_hash_enums MENU_LABEL(JOYPAD_AUTOCONFIG_DIR), MENU_LABEL(DRIVER_SETTINGS), MENU_LABEL(VIDEO_SETTINGS), + MENU_LABEL(VIDEO_SCALING_SETTINGS), MENU_LABEL(CRT_SWITCHRES_SETTINGS), MENU_LABEL(AUDIO_SETTINGS), MENU_LABEL(AUDIO_MIXER_SETTINGS),