From 437da14c9a45075cf96fc80bca1c3d9d39c4c217 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Sun, 21 Jun 2015 02:25:17 +0200 Subject: [PATCH] (Menu) Menu hashes update --- menu/menu_hash.c | 36 ++++++++++++++++++++++++++++++++++++ menu/menu_hash.h | 22 ++++++++++++++++++++++ menu/menu_setting.c | 36 ++++++++++++++++++------------------ 3 files changed, 76 insertions(+), 18 deletions(-) diff --git a/menu/menu_hash.c b/menu/menu_hash.c index bd1c45b6c9..82da78194a 100644 --- a/menu/menu_hash.c +++ b/menu/menu_hash.c @@ -643,6 +643,42 @@ static const char *menu_hash_to_str_english(uint32_t hash) return "video_crop_overscan"; case MENU_LABEL_VALUE_VIDEO_CROP_OVERSCAN: return "Crop Overscan (Reload)"; + case MENU_LABEL_VIDEO_ASPECT_RATIO_INDEX: + return "aspect_ratio_index"; + case MENU_LABEL_VALUE_VIDEO_ASPECT_RATIO_INDEX: + return "Aspect Ratio Index"; + case MENU_LABEL_VIDEO_ASPECT_RATIO_AUTO: + return "video_aspect_ratio_auto"; + case MENU_LABEL_VALUE_VIDEO_ASPECT_RATIO_AUTO: + return "Auto Aspect Ratio"; + case MENU_LABEL_VIDEO_FORCE_ASPECT: + return "video_force_aspect"; + case MENU_LABEL_VALUE_VIDEO_FORCE_ASPECT: + return "Force aspect ratio"; + case MENU_LABEL_VIDEO_REFRESH_RATE: + return "video_refresh_rate"; + case MENU_LABEL_VALUE_VIDEO_REFRESH_RATE: + return "Refresh Rate"; + case MENU_LABEL_VIDEO_FORCE_SRGB_DISABLE: + return "video_force_srgb_disable"; + case MENU_LABEL_VALUE_VIDEO_FORCE_SRGB_DISABLE: + return "Force-disable sRGB FBO"; + case MENU_LABEL_VIDEO_WINDOWED_FULLSCREEN: + return "video_windowed_fullscreen"; + case MENU_LABEL_VALUE_VIDEO_WINDOWED_FULLSCREEN: + return "Windowed Fullscreen Mode"; + case MENU_LABEL_PAL60_ENABLE: + return "pal60_enable"; + case MENU_LABEL_VALUE_PAL60_ENABLE: + return "Use PAL60 Mode"; + case MENU_LABEL_VIDEO_VFILTER: + return "video_vfilter"; + case MENU_LABEL_VALUE_VIDEO_VFILTER: + return "Deflicker"; + case MENU_LABEL_VIDEO_VI_WIDTH: + return "video_vi_width"; + case MENU_LABEL_VALUE_VIDEO_VI_WIDTH: + return "Set VI Screen Width"; case MENU_LABEL_VALUE_VIDEO_BLACK_FRAME_INSERTION: return "Black Frame Insertion"; case MENU_LABEL_VIDEO_BLACK_FRAME_INSERTION: diff --git a/menu/menu_hash.h b/menu/menu_hash.h index 9204eca92a..e335eb8c6c 100644 --- a/menu/menu_hash.h +++ b/menu/menu_hash.h @@ -207,6 +207,12 @@ extern "C" { #define MENU_LABEL_VALUE_INPUT_OSK_OVERLAY_ENABLE 0x44e487aeU #define MENU_LABEL_VIDEO_REFRESH_RATE_AUTO 0x9addb6cdU #define MENU_LABEL_VALUE_VIDEO_REFRESH_RATE_AUTO 0xaf24a804U +#define MENU_LABEL_VIDEO_REFRESH_RATE 0x56ccabf5U +#define MENU_LABEL_VALUE_VIDEO_REFRESH_RATE 0xdf36d1e0U +#define MENU_LABEL_VIDEO_WINDOWED_FULLSCREEN 0x6436d6f8U +#define MENU_LABEL_VALUE_VIDEO_WINDOWED_FULLSCREEN 0x133c7afeU +#define MENU_LABEL_VIDEO_FORCE_SRGB_DISABLE 0x0a7b68aaU +#define MENU_LABEL_VALUE_VIDEO_FORCE_SRGB_DISABLE 0xe5bfa9baU #define MENU_LABEL_VIDEO_ROTATION 0x4ce6882bU #define MENU_LABEL_VIDEO_SCALE 0x09835d63U #define MENU_LABEL_VALUE_VIDEO_SCALE 0x5cde89ceU @@ -553,6 +559,8 @@ extern "C" { #define MENU_LABEL_VIDEO_FONT_PATH 0xd0de729eU #define MENU_LABEL_VIDEO_FILTER 0x1c0eb741U #define MENU_LABEL_VALUE_VIDEO_FILTER 0xc1690382U +#define MENU_LABEL_PAL60_ENABLE 0x62bc416eU +#define MENU_LABEL_VALUE_PAL60_ENABLE 0x05a5bc9aU #define MENU_LABEL_MENU_WALLPAPER 0x3b84de01U #define MENU_LABEL_CONTENT_HISTORY_PATH 0x6f22fb9dU #define MENU_LABEL_AUDIO_DSP_PLUGIN 0x4a69572bU @@ -682,6 +690,20 @@ extern "C" { #define MENU_LABEL_VALUE_USER_LANGUAGE 0xd230a5a9U #define MENU_LABEL_NETPLAY_NICKNAME 0x52204787U #define MENU_LABEL_VALUE_NETPLAY_NICKNAME 0x75de3125U +#define MENU_LABEL_VIDEO_VI_WIDTH 0x6e4a6d3aU +#define MENU_LABEL_VALUE_VIDEO_VI_WIDTH 0x03c07e50U + +#define MENU_LABEL_VIDEO_FORCE_ASPECT 0x8bbf9329U +#define MENU_LABEL_VALUE_VIDEO_FORCE_ASPECT 0xa5590df3U + +#define MENU_LABEL_VIDEO_ASPECT_RATIO_AUTO 0xa7c31991U +#define MENU_LABEL_VALUE_VIDEO_ASPECT_RATIO_AUTO 0x40bd9f87U + +#define MENU_LABEL_VIDEO_ASPECT_RATIO_INDEX 0x3b01a19aU +#define MENU_LABEL_VALUE_VIDEO_ASPECT_RATIO_INDEX 0x9ce00246U + +#define MENU_LABEL_VIDEO_VFILTER 0x664f8397U +#define MENU_LABEL_VALUE_VIDEO_VFILTER 0xd58b0158U #define MENU_LABEL_VIDEO_GPU_RECORD 0xb6059a65U #define MENU_LABEL_VALUE_VIDEO_GPU_RECORD 0x2241deb7U diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 3f5e4a4a80..261db314c0 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -4506,8 +4506,8 @@ static bool setting_append_list_video_options( #endif CONFIG_BOOL( settings->video.windowed_fullscreen, - "video_windowed_fullscreen", - "Windowed Fullscreen Mode", + menu_hash_to_str(MENU_LABEL_VIDEO_WINDOWED_FULLSCREEN), + menu_hash_to_str(MENU_LABEL_VALUE_VIDEO_WINDOWED_FULLSCREEN), windowed_fullscreen, menu_hash_to_str(MENU_VALUE_OFF), menu_hash_to_str(MENU_VALUE_ON), @@ -4519,8 +4519,8 @@ static bool setting_append_list_video_options( CONFIG_FLOAT( settings->video.refresh_rate, - "video_refresh_rate", - "Refresh Rate", + menu_hash_to_str(MENU_LABEL_VIDEO_REFRESH_RATE), + menu_hash_to_str(MENU_LABEL_VALUE_VIDEO_REFRESH_RATE), refresh_rate, "%.3f Hz", group_info.name, @@ -4549,8 +4549,8 @@ static bool setting_append_list_video_options( CONFIG_BOOL( settings->video.force_srgb_disable, - "video_force_srgb_disable", - "Force-disable sRGB FBO", + menu_hash_to_str(MENU_LABEL_VIDEO_FORCE_SRGB_DISABLE), + menu_hash_to_str(MENU_LABEL_VALUE_VIDEO_FORCE_SRGB_DISABLE), false, menu_hash_to_str(MENU_VALUE_OFF), menu_hash_to_str(MENU_VALUE_ON), @@ -4566,8 +4566,8 @@ static bool setting_append_list_video_options( START_SUB_GROUP(list, list_info, "Aspect", group_info.name, subgroup_info, parent_group); CONFIG_BOOL( settings->video.force_aspect, - "video_force_aspect", - "Force aspect ratio", + menu_hash_to_str(MENU_LABEL_VIDEO_FORCE_ASPECT), + menu_hash_to_str(MENU_LABEL_VALUE_VIDEO_FORCE_ASPECT), force_aspect, menu_hash_to_str(MENU_VALUE_OFF), menu_hash_to_str(MENU_VALUE_ON), @@ -4579,8 +4579,8 @@ static bool setting_append_list_video_options( CONFIG_BOOL( settings->video.aspect_ratio_auto, - "video_aspect_ratio_auto", - "Auto Aspect Ratio", + menu_hash_to_str(MENU_LABEL_VIDEO_ASPECT_RATIO_AUTO), + menu_hash_to_str(MENU_LABEL_VALUE_VIDEO_ASPECT_RATIO_AUTO), aspect_ratio_auto, menu_hash_to_str(MENU_VALUE_OFF), menu_hash_to_str(MENU_VALUE_ON), @@ -4592,8 +4592,8 @@ static bool setting_append_list_video_options( CONFIG_UINT( settings->video.aspect_ratio_idx, - "aspect_ratio_index", - "Aspect Ratio Index", + menu_hash_to_str(MENU_LABEL_VIDEO_ASPECT_RATIO_INDEX), + menu_hash_to_str(MENU_LABEL_VALUE_VIDEO_ASPECT_RATIO_INDEX), aspect_ratio_idx, group_info.name, subgroup_info.name, @@ -4650,8 +4650,8 @@ static bool setting_append_list_video_options( #ifdef GEKKO CONFIG_UINT( settings->video.viwidth, - "video_viwidth", - "Set Screen Width", + menu_hash_to_str(MENU_LABEL_VIDEO_VI_WIDTH), + menu_hash_to_str(MENU_LABEL_VALUE_VIDEO_VI_WIDTH), video_viwidth, group_info.name, subgroup_info.name, @@ -4662,8 +4662,8 @@ static bool setting_append_list_video_options( CONFIG_BOOL( settings->video.vfilter, - "video_vfilter", - "Deflicker", + menu_hash_to_str(MENU_LABEL_VIDEO_VFILTER), + menu_hash_to_str(MENU_LABEL_VALUE_VIDEO_VFILTER), video_vfilter, menu_hash_to_str(MENU_VALUE_OFF), menu_hash_to_str(MENU_VALUE_ON), @@ -4690,8 +4690,8 @@ static bool setting_append_list_video_options( #if defined(__CELLOS_LV2__) CONFIG_BOOL( global->console.screen.pal60_enable, - "pal60_enable", - "Use PAL60 Mode", + menu_hash_to_str(MENU_LABEL_PAL60_ENABLE), + menu_hash_to_str(MENU_LABEL_VALUE_PAL60_ENABLE), false, menu_hash_to_str(MENU_VALUE_OFF), menu_hash_to_str(MENU_VALUE_ON),