From 7cce75f5529c6775c97200300720228e60c7f3fa Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 20 Oct 2016 20:52:20 +0200 Subject: [PATCH] Add sublabel settings --- intl/msg_hash_us.c | 12 +++++- menu/cbs/menu_cbs_sublabel.c | 84 ++++++++++++++++++++++++++++++++++++ msg_hash.h | 5 +++ 3 files changed, 100 insertions(+), 1 deletion(-) diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c index 8670da0118..67c16602df 100644 --- a/intl/msg_hash_us.c +++ b/intl/msg_hash_us.c @@ -3023,6 +3023,12 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg) switch (msg) { + case MENU_ENUM_SUBLABEL_VIDEO_BLACK_FRAME_INSERTION: + return "Inserts a black frame inbetween frames. Useful for 120 Hz monitors who want to play 60 Hz material with eliminated ghosting."; + case MENU_ENUM_SUBLABEL_VIDEO_FRAME_DELAY: + return "Reduces latency at cost of higher risk of video stuttering by adding a delay after V-Sync (in ms)."; + case MENU_ENUM_SUBLABEL_ADD_CONTENT_LIST: + return "Download and/or scan content, and add it to your collection."; case MENU_ENUM_SUBLABEL_NETPLAY: return "Join or host a netplay session."; case MENU_ENUM_SUBLABEL_FPS_SHOW: @@ -3034,9 +3040,13 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg) case MENU_ENUM_SUBLABEL_SUSPEND_SCREENSAVER_ENABLE: return "Prevents your system's screensaver from becoming active."; case MENU_ENUM_SUBLABEL_VIDEO_MAX_SWAPCHAIN_IMAGES: - return "Tell the video driver to explicitly use a specified buffering mode."; + return "Tells the video driver to explicitly use a specified buffering mode."; case MENU_ENUM_SUBLABEL_ONLINE_UPDATER: return "Download and update add-ons and components for RetroArch."; + case MENU_ENUM_SUBLABEL_INPUT_USER_BINDS: + return "Configure controls for this user."; + case MENU_ENUM_SUBLABEL_INPUT_HOTKEY_BINDS: + return "Configure hotkey settings."; case MSG_VALUE_SHUTTING_DOWN: return "Shutting down..."; case MSG_VALUE_REBOOTING: diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index 357d96fb8f..3694792619 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -102,10 +102,64 @@ static int action_bind_sublabel_netplay_settings( const char *label, const char *path, char *s, size_t len) { + strlcpy(s, msg_hash_to_str(MENU_ENUM_SUBLABEL_NETPLAY), len); return 0; } +static int action_bind_sublabel_user_bind_settings( + file_list_t *list, + unsigned type, unsigned i, + const char *label, const char *path, + char *s, size_t len) +{ + + strlcpy(s, msg_hash_to_str(MENU_ENUM_SUBLABEL_INPUT_USER_BINDS), len); + return 0; +} + +static int action_bind_sublabel_input_hotkey_settings( + file_list_t *list, + unsigned type, unsigned i, + const char *label, const char *path, + char *s, size_t len) +{ + + strlcpy(s, msg_hash_to_str(MENU_ENUM_SUBLABEL_INPUT_HOTKEY_BINDS), len); + return 0; +} + +static int action_bind_sublabel_add_content_list( + file_list_t *list, + unsigned type, unsigned i, + const char *label, const char *path, + char *s, size_t len) +{ + + strlcpy(s, msg_hash_to_str(MENU_ENUM_SUBLABEL_ADD_CONTENT_LIST), len); + return 0; +} + +static int action_bind_sublabel_video_frame_delay( + file_list_t *list, + unsigned type, unsigned i, + const char *label, const char *path, + char *s, size_t len) +{ + strlcpy(s, msg_hash_to_str(MENU_ENUM_SUBLABEL_VIDEO_FRAME_DELAY), len); + return 0; +} + +static int action_bind_sublabel_video_black_frame_insertion( + file_list_t *list, + unsigned type, unsigned i, + const char *label, const char *path, + char *s, size_t len) +{ + strlcpy(s, msg_hash_to_str(MENU_ENUM_SUBLABEL_VIDEO_BLACK_FRAME_INSERTION), len); + return 0; +} + int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, const char *path, const char *label, unsigned type, size_t idx) { @@ -118,6 +172,36 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, { switch (cbs->enum_idx) { + case MENU_ENUM_LABEL_VIDEO_BLACK_FRAME_INSERTION: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_video_black_frame_insertion); + break; + case MENU_ENUM_LABEL_VIDEO_FRAME_DELAY: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_video_frame_delay); + break; + case MENU_ENUM_LABEL_ADD_CONTENT_LIST: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_add_content_list); + break; + case MENU_ENUM_LABEL_INPUT_HOTKEY_BINDS: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_hotkey_settings); + break; + case MENU_ENUM_LABEL_INPUT_USER_1_BINDS: + case MENU_ENUM_LABEL_INPUT_USER_2_BINDS: + case MENU_ENUM_LABEL_INPUT_USER_3_BINDS: + case MENU_ENUM_LABEL_INPUT_USER_4_BINDS: + case MENU_ENUM_LABEL_INPUT_USER_5_BINDS: + case MENU_ENUM_LABEL_INPUT_USER_6_BINDS: + case MENU_ENUM_LABEL_INPUT_USER_7_BINDS: + case MENU_ENUM_LABEL_INPUT_USER_8_BINDS: + case MENU_ENUM_LABEL_INPUT_USER_9_BINDS: + case MENU_ENUM_LABEL_INPUT_USER_10_BINDS: + case MENU_ENUM_LABEL_INPUT_USER_11_BINDS: + case MENU_ENUM_LABEL_INPUT_USER_12_BINDS: + case MENU_ENUM_LABEL_INPUT_USER_13_BINDS: + case MENU_ENUM_LABEL_INPUT_USER_14_BINDS: + case MENU_ENUM_LABEL_INPUT_USER_15_BINDS: + case MENU_ENUM_LABEL_INPUT_USER_16_BINDS: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_user_bind_settings); + break; case MENU_ENUM_LABEL_NETPLAY: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_netplay_settings); break; diff --git a/msg_hash.h b/msg_hash.h index d5458bf3ee..4c8c68b99e 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -1865,6 +1865,11 @@ enum msg_hash_enums MENU_ENUM_LABEL_CB_CORE_UPDATER_DOWNLOAD, MENU_ENUM_LABEL_CB_CORE_THUMBNAILS_DOWNLOAD, + MENU_ENUM_SUBLABEL_VIDEO_BLACK_FRAME_INSERTION, + MENU_ENUM_SUBLABEL_VIDEO_FRAME_DELAY, + MENU_ENUM_SUBLABEL_ADD_CONTENT_LIST, + MENU_ENUM_SUBLABEL_INPUT_USER_BINDS, + MENU_ENUM_SUBLABEL_INPUT_HOTKEY_BINDS, MENU_ENUM_SUBLABEL_VIDEO_SETTINGS, MENU_ENUM_SUBLABEL_AUDIO_SETTINGS, MENU_ENUM_SUBLABEL_SUSPEND_SCREENSAVER_ENABLE,