mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 19:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10772 from guoyunhe/fix-ctx-scale-msg

Browse Source 
Avoid duplicate keys
This commit is contained in:
Autechre 2020-06-03 14:05:16 +02:00 committed by GitHub
commit 26a5fdcba4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intl/msg_hash_us.h
View File

@ -10898,11 +10898,11 @@ MSG_HASH(
#endif
#ifdef HAVE_ODROIDGO2
MSG_HASH(
MENU_ENUM_LABEL_VALUE_VIDEO_CTX_SCALING,
MENU_ENUM_LABEL_VALUE_VIDEO_RGA_SCALING,
"RGA Scaling"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_VIDEO_CTX_SCALING,
MENU_ENUM_SUBLABEL_VIDEO_RGA_SCALING,
"RGA scaling and bicubic filtering. May break widgets."
)
#else

4
menu/cbs/menu_cbs_sublabel.c
View File

@ -283,7 +283,11 @@ default_sublabel_macro(action_bind_sublabel_audio_max_timing_skew, MENU_
default_sublabel_macro(action_bind_sublabel_pause_nonactive, MENU_ENUM_SUBLABEL_PAUSE_NONACTIVE)
default_sublabel_macro(action_bind_sublabel_video_disable_composition, MENU_ENUM_SUBLABEL_VIDEO_DISABLE_COMPOSITION)
default_sublabel_macro(action_bind_sublabel_video_smooth, MENU_ENUM_SUBLABEL_VIDEO_SMOOTH)
#ifdef HAVE_ODROIDGO2
default_sublabel_macro(action_bind_sublabel_video_ctx_scaling, MENU_ENUM_SUBLABEL_VIDEO_RGA_SCALING)
#else
default_sublabel_macro(action_bind_sublabel_video_ctx_scaling, MENU_ENUM_SUBLABEL_VIDEO_CTX_SCALING)
#endif
default_sublabel_macro(action_bind_sublabel_history_list_enable, MENU_ENUM_SUBLABEL_HISTORY_LIST_ENABLE)
default_sublabel_macro(action_bind_sublabel_content_history_size, MENU_ENUM_SUBLABEL_CONTENT_HISTORY_SIZE)
default_sublabel_macro(action_bind_sublabel_content_favorites_size, MENU_ENUM_SUBLABEL_CONTENT_FAVORITES_SIZE)

2
menu/menu_setting.c
View File

@ -10380,7 +10380,7 @@ static bool setting_append_list(
list, list_info,
&settings->bools.video_ctx_scaling,
MENU_ENUM_LABEL_VIDEO_CTX_SCALING,
MENU_ENUM_LABEL_VALUE_VIDEO_CTX_SCALING,
MENU_ENUM_LABEL_VALUE_VIDEO_RGA_SCALING,
DEFAULT_VIDEO_CTX_SCALING,
MENU_ENUM_LABEL_VALUE_OFF,
MENU_ENUM_LABEL_VALUE_ON,