From ac30f990468ad4afd153fe9472c63496ed84ee69 Mon Sep 17 00:00:00 2001 From: Huw Pascoe Date: Fri, 29 Mar 2019 18:24:33 +0000 Subject: [PATCH] video_layout msg_hash --- intl/msg_hash_lbl.h | 24 +++++++++++++++++++ intl/msg_hash_us.c | 24 +++++++++++++++++++ intl/msg_hash_us.h | 58 +++++++++++++++++++++++++++++++++++++++++++++ msg_hash.h | 30 +++++++++++++++++++++++ 4 files changed, 136 insertions(+) diff --git a/intl/msg_hash_lbl.h b/intl/msg_hash_lbl.h index a36169db3a..291064c838 100644 --- a/intl/msg_hash_lbl.h +++ b/intl/msg_hash_lbl.h @@ -359,6 +359,10 @@ MSG_HASH(MENU_ENUM_LABEL_DEFERRED_ONSCREEN_DISPLAY_SETTINGS_LIST, "deferred_onscreen_display_settings_list") MSG_HASH(MENU_ENUM_LABEL_DEFERRED_ONSCREEN_OVERLAY_SETTINGS_LIST, "deferred_onscreen_overlay_settings_list") +#ifdef HAVE_VIDEO_LAYOUT +MSG_HASH(MENU_ENUM_LABEL_DEFERRED_ONSCREEN_VIDEO_LAYOUT_SETTINGS_LIST, + "deferred_onscreen_video_layout_settings_list") +#endif MSG_HASH(MENU_ENUM_LABEL_DEFERRED_ONSCREEN_NOTIFICATIONS_SETTINGS_LIST, "deferred_onscreen_notifications_settings_list") MSG_HASH(MENU_ENUM_LABEL_DEFERRED_PLAYLIST_SETTINGS_LIST, @@ -803,6 +807,10 @@ MSG_HASH(MENU_ENUM_LABEL_ONSCREEN_DISPLAY_SETTINGS, "onscreen_display_settings") MSG_HASH(MENU_ENUM_LABEL_ONSCREEN_OVERLAY_SETTINGS, "onscreen_overlay_settings") +#ifdef HAVE_VIDEO_LAYOUT +MSG_HASH(MENU_ENUM_LABEL_ONSCREEN_VIDEO_LAYOUT_SETTINGS, + "onscreen_video_layout_settings") +#endif MSG_HASH(MENU_ENUM_LABEL_ONSCREEN_NOTIFICATIONS_SETTINGS, "onscreen_notifications_settings") MSG_HASH(MENU_ENUM_LABEL_OPEN_ARCHIVE, @@ -813,6 +821,10 @@ MSG_HASH(MENU_ENUM_LABEL_OVERLAY_AUTOLOAD_PREFERRED, "overlay_autoload_preferred") MSG_HASH(MENU_ENUM_LABEL_OVERLAY_DIRECTORY, "overlay_directory") +#ifdef HAVE_VIDEO_LAYOUT +MSG_HASH(MENU_ENUM_LABEL_VIDEO_LAYOUT_DIRECTORY, + "video_layout_directory") +#endif MSG_HASH(MENU_ENUM_LABEL_OVERLAY_OPACITY, "input_overlay_opacity") MSG_HASH(MENU_ENUM_LABEL_OVERLAY_PRESET, @@ -1337,6 +1349,14 @@ MSG_HASH(MENU_ENUM_LABEL_VIDEO_FULLSCREEN_X, "video_fullscreen_x") MSG_HASH(MENU_ENUM_LABEL_VIDEO_FULLSCREEN_Y, "video_fullscreen_y") +#ifdef HAVE_VIDEO_LAYOUT +MSG_HASH(MENU_ENUM_LABEL_VIDEO_LAYOUT_ENABLE, + "video_layout_enable") +MSG_HASH(MENU_ENUM_LABEL_VIDEO_LAYOUT_PATH, + "video_layout_path") +MSG_HASH(MENU_ENUM_LABEL_VIDEO_LAYOUT_SELECTED_VIEW, + "video_layout_selected_view") +#endif MSG_HASH(MENU_ENUM_LABEL_WIFI_DRIVER, "wifi_driver") MSG_HASH(MENU_ENUM_LABEL_WIFI_SETTINGS, @@ -1639,6 +1659,10 @@ MSG_HASH(MENU_ENUM_LABEL_CONTENT_SHOW_LATENCY, "menu_show_latency_settings") MSG_HASH(MENU_ENUM_LABEL_CONTENT_SHOW_OVERLAYS, "menu_show_overlay_settings") +#ifdef HAVE_VIDEO_LAYOUT +MSG_HASH(MENU_ENUM_LABEL_CONTENT_SHOW_VIDEO_LAYOUT, + "menu_show_video_layout_settings") +#endif MSG_HASH(MENU_ENUM_LABEL_AUDIO_ENABLE_MENU, "audio_enable_menu") MSG_HASH(MENU_ENUM_LABEL_AUDIO_MIXER_SETTINGS, diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c index f0b6552d68..c5d72850c9 100644 --- a/intl/msg_hash_us.c +++ b/intl/msg_hash_us.c @@ -631,6 +631,21 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len) snprintf(s, len, "Overlay opacity."); break; +#ifdef HAVE_VIDEO_LAYOUT + case MENU_ENUM_LABEL_VIDEO_LAYOUT_ENABLE: + snprintf(s, len, + "Enable or disable the current video layout."); + break; + case MENU_ENUM_LABEL_VIDEO_LAYOUT_PATH: + snprintf(s, len, + "Path to video layout."); + break; + case MENU_ENUM_LABEL_VIDEO_LAYOUT_SELECTED_VIEW: + snprintf(s, len, + "Layouts can contain multiple views. \n" + "Select a view."); + break; +#endif case MENU_ENUM_LABEL_INPUT_BIND_TIMEOUT: snprintf(s, len, "Input bind timer timeout (in seconds). \n" @@ -1825,6 +1840,15 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len) "Defines a directory where overlays are \n" "kept for easy access."); break; +#ifdef HAVE_VIDEO_LAYOUT + case MENU_ENUM_LABEL_VIDEO_LAYOUT_DIRECTORY: + snprintf(s, len, + "Video Layout Directory. \n" + " \n" + "Defines a directory where video layouts are \n" + "kept for easy access."); + break; +#endif case MENU_ENUM_LABEL_INPUT_MAX_USERS: snprintf(s, len, "Maximum amount of users supported by \n" diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 68cb427fcc..50acfe8663 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -2028,6 +2028,16 @@ MSG_HASH( MENU_ENUM_SUBLABEL_ONSCREEN_OVERLAY_SETTINGS, "Adjust Bezels and Onscreen controls" ) +#ifdef HAVE_VIDEO_LAYOUT +MSG_HASH( + MENU_ENUM_LABEL_VALUE_ONSCREEN_VIDEO_LAYOUT_SETTINGS, + "Video Layout" + ) +MSG_HASH( + MENU_ENUM_SUBLABEL_ONSCREEN_VIDEO_LAYOUT_SETTINGS, + "Adjust Video Layout" + ) +#endif MSG_HASH( MENU_ENUM_LABEL_VALUE_ONSCREEN_NOTIFICATIONS_SETTINGS, "Onscreen Notifications" @@ -2056,6 +2066,12 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_OVERLAY_DIRECTORY, "Overlay" ) +#ifdef HAVE_VIDEO_LAYOUT +MSG_HASH( + MENU_ENUM_LABEL_VALUE_VIDEO_LAYOUT_DIRECTORY, + "Video Layout" + ) +#endif MSG_HASH( MENU_ENUM_LABEL_VALUE_OVERLAY_OPACITY, "Overlay Opacity" @@ -3748,6 +3764,32 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_VIDEO_FULLSCREEN_Y, "Fullscreen Height" ) +#ifdef HAVE_VIDEO_LAYOUT +MSG_HASH( + MENU_ENUM_LABEL_VALUE_VIDEO_LAYOUT_ENABLE, + "Enable Video Layout" + ) +MSG_HASH( + MENU_ENUM_SUBLABEL_VIDEO_LAYOUT_ENABLE, + "Video layouts are used for bezels and other artwork." + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_VIDEO_LAYOUT_PATH, + "Video Layout Path" + ) +MSG_HASH( + MENU_ENUM_SUBLABEL_VIDEO_LAYOUT_PATH, + "Select a video layout from the file browser." + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_VIDEO_LAYOUT_SELECTED_VIEW, + "Selected View" + ) +MSG_HASH( + MENU_ENUM_SUBLABEL_VIDEO_LAYOUT_SELECTED_VIEW, + "Select a view within the loaded layout." + ) +#endif MSG_HASH( MENU_ENUM_LABEL_VALUE_WIFI_DRIVER, "Wi-Fi" @@ -6260,6 +6302,12 @@ MSG_HASH( MENU_ENUM_SUBLABEL_OVERLAY_DIRECTORY, "Defines a directory where overlays are kept for easy access." ) +#ifdef HAVE_VIDEO_LAYOUT +MSG_HASH( + MENU_ENUM_SUBLABEL_VIDEO_LAYOUT_DIRECTORY, + "Defines a directory where video layouts are kept for easy access." + ) +#endif MSG_HASH( MENU_ENUM_SUBLABEL_CHEAT_DATABASE_PATH, "Cheat files are kept here." @@ -7047,6 +7095,16 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_OVERLAYS, "Show Overlay Settings" ) +#ifdef HAVE_VIDEO_LAYOUT +MSG_HASH( + MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_VIDEO_LAYOUT, + "Show Video Layout Settings" + ) +MSG_HASH( + MENU_ENUM_SUBLABEL_CONTENT_SHOW_VIDEO_LAYOUT, + "Show/hide Video Layout options." + ) +#endif MSG_HASH( MENU_ENUM_LABEL_VALUE_AUDIO_ENABLE_MENU, "Mixer" diff --git a/msg_hash.h b/msg_hash.h index 71c3a63ec5..71b36c8e50 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -94,6 +94,9 @@ enum msg_file_type FILE_TYPE_MD5, FILE_TYPE_CRC, FILE_TYPE_RGUI_THEME_PRESET, +#ifdef HAVE_VIDEO_LAYOUT + FILE_TYPE_VIDEO_LAYOUT, +#endif FILE_TYPE_WEBM, FILE_TYPE_F4F, @@ -840,6 +843,12 @@ enum msg_hash_enums MENU_LABEL(VIDEO_REFRESH_RATE_AUTO), MENU_LABEL(VIDEO_REFRESH_RATE_POLLED), +#ifdef HAVE_VIDEO_LAYOUT + MENU_LABEL(VIDEO_LAYOUT_ENABLE), + MENU_LABEL(VIDEO_LAYOUT_PATH), + MENU_LABEL(VIDEO_LAYOUT_SELECTED_VIEW), +#endif + MENU_LABEL(PARENT_DIRECTORY), MENU_LABEL(FILE_BROWSER_OPEN_UWP_PERMISSIONS), @@ -896,6 +905,9 @@ enum msg_hash_enums MENU_LABEL(CONTENT_SHOW_REWIND), MENU_LABEL(CONTENT_SHOW_LATENCY), MENU_LABEL(CONTENT_SHOW_OVERLAYS), +#ifdef HAVE_VIDEO_LAYOUT + MENU_LABEL(CONTENT_SHOW_VIDEO_LAYOUT), +#endif MENU_LABEL(CONTENT_SHOW_SETTINGS), MENU_LABEL(CONTENT_SHOW_SETTINGS_PASSWORD), MENU_LABEL(CONTENT_SHOW_FAVORITES), @@ -981,6 +993,9 @@ enum msg_hash_enums MENU_ENUM_LABEL_FILE_BROWSER_CORE, MENU_ENUM_LABEL_FILE_BROWSER_SIDELOAD_CORE, MENU_ENUM_LABEL_FILE_BROWSER_OVERLAY, +#ifdef HAVE_VIDEO_LAYOUT + MENU_ENUM_LABEL_FILE_BROWSER_VIDEO_LAYOUT, +#endif MENU_ENUM_LABEL_FILE_BROWSER_CHEAT, MENU_ENUM_LABEL_FILE_BROWSER_FONT, MENU_ENUM_LABEL_FILE_BROWSER_RDB, @@ -1167,6 +1182,9 @@ enum msg_hash_enums MENU_ENUM_LABEL_DEFERRED_CHEAT_SEARCH_SETTINGS_LIST, MENU_ENUM_LABEL_DEFERRED_ONSCREEN_DISPLAY_SETTINGS_LIST, MENU_ENUM_LABEL_DEFERRED_ONSCREEN_OVERLAY_SETTINGS_LIST, +#ifdef HAVE_VIDEO_LAYOUT + MENU_ENUM_LABEL_DEFERRED_ONSCREEN_VIDEO_LAYOUT_SETTINGS_LIST, +#endif MENU_ENUM_LABEL_DEFERRED_ONSCREEN_NOTIFICATIONS_SETTINGS_LIST, MENU_ENUM_LABEL_DEFERRED_MENU_VIEWS_SETTINGS_LIST, MENU_ENUM_LABEL_DEFERRED_QUICK_MENU_VIEWS_SETTINGS_LIST, @@ -1734,6 +1752,9 @@ enum msg_hash_enums MENU_LABEL(LIBRETRO_INFO_PATH), MENU_LABEL(RGUI_CONFIG_DIRECTORY), MENU_LABEL(OVERLAY_DIRECTORY), +#ifdef HAVE_VIDEO_LAYOUT + MENU_LABEL(VIDEO_LAYOUT_DIRECTORY), +#endif MENU_LABEL(SYSTEM_DIRECTORY), MENU_LABEL(ASSETS_DIRECTORY), MENU_LABEL(CACHE_DIRECTORY), @@ -1766,6 +1787,9 @@ enum msg_hash_enums MENU_LABEL(SAVE_NEW_CONFIG), MENU_LABEL(ONSCREEN_DISPLAY_SETTINGS), MENU_LABEL(ONSCREEN_OVERLAY_SETTINGS), +#ifdef HAVE_VIDEO_LAYOUT + MENU_LABEL(ONSCREEN_VIDEO_LAYOUT_SETTINGS), +#endif MENU_LABEL(ONSCREEN_NOTIFICATIONS_SETTINGS), MENU_LABEL(CHEAT_APPLY_CHANGES), MENU_LABEL(CHEAT_START_SEARCH), @@ -2446,6 +2470,9 @@ enum msg_hash_enums #define MENU_LABEL_VIDEO_SHADER_PRESET_PARAMETERS 0xd18158d7U #define MENU_LABEL_VIDEO_SHADER_PASS 0x4fa31028U #define MENU_LABEL_VIDEO_SHADER_PRESET 0xc5d3bae4U +#ifdef HAVE_VIDEO_LAYOUT +#define MENU_LABEL_VIDEO_LAYOUT_PATH 0x749cfea5U +#endif /* Input settings */ #define MENU_LABEL_INPUT_OVERLAY 0x24e24796U @@ -2493,6 +2520,9 @@ enum msg_hash_enums #define MENU_LABEL_SYSTEM_DIRECTORY 0x35a6fb9eU #define MENU_LABEL_INPUT_REMAPPING_DIRECTORY 0x5233c20bU #define MENU_LABEL_OVERLAY_DIRECTORY 0xc4ed3d1bU +#ifdef HAVE_VIDEO_LAYOUT +#define MENU_LABEL_VIDEO_LAYOUT_DIRECTORY 0x07d5528dU +#endif #define MENU_LABEL_SAVEFILE_DIRECTORY 0x92773488U #define MENU_LABEL_SAVESTATE_DIRECTORY 0x90551289U #define MENU_LABEL_DYNAMIC_WALLPAPERS_DIRECTORY 0x62f975b8U