From f09be107c651132687ee75054acac512654db231 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 11 Sep 2021 17:56:44 +0200 Subject: [PATCH] Cleanup some extra ifdefs --- menu/menu_setting.c | 385 ++++++++++++++++++++++---------------------- 1 file changed, 190 insertions(+), 195 deletions(-) diff --git a/menu/menu_setting.c b/menu/menu_setting.c index a2d41038dd..bf93d80d82 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -4288,9 +4288,7 @@ static void setting_get_string_representation_uint_xmb_icon_theme( break; } } -#endif -#ifdef HAVE_XMB static void setting_get_string_representation_uint_xmb_layout( rarch_setting_t *setting, char *s, size_t len) @@ -4311,6 +4309,138 @@ static void setting_get_string_representation_uint_xmb_layout( break; } } + +static void setting_get_string_representation_uint_xmb_menu_color_theme( + rarch_setting_t *setting, + char *s, size_t len) +{ + if (!setting) + return; + + switch (*setting->value.target.unsigned_integer) + { + case XMB_THEME_WALLPAPER: + strlcpy(s, + msg_hash_to_str( + MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_PLAIN), + len); + break; + case XMB_THEME_LEGACY_RED: + strlcpy(s, + msg_hash_to_str( + MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_LEGACY_RED), + len); + break; + case XMB_THEME_DARK_PURPLE: + strlcpy(s, + msg_hash_to_str( + MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_DARK_PURPLE), + len); + break; + case XMB_THEME_MIDNIGHT_BLUE: + strlcpy(s, + msg_hash_to_str( + MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_MIDNIGHT_BLUE), + len); + break; + case XMB_THEME_GOLDEN: + strlcpy(s, + msg_hash_to_str( + MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_GOLDEN), + len); + break; + case XMB_THEME_ELECTRIC_BLUE: + strlcpy(s, + msg_hash_to_str( + MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_ELECTRIC_BLUE), + len); + break; + case XMB_THEME_APPLE_GREEN: + strlcpy(s, + msg_hash_to_str( + MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_APPLE_GREEN), + len); + break; + case XMB_THEME_UNDERSEA: + strlcpy(s, + msg_hash_to_str( + MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_UNDERSEA), + len); + break; + case XMB_THEME_VOLCANIC_RED: + strlcpy(s, + msg_hash_to_str( + MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_VOLCANIC_RED), + len); + break; + case XMB_THEME_DARK: + strlcpy(s, + msg_hash_to_str( + MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_DARK), + len); + break; + case XMB_THEME_LIGHT: + strlcpy(s, + msg_hash_to_str( + MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_LIGHT), + len); + break; + case XMB_THEME_MORNING_BLUE: + strlcpy(s, + msg_hash_to_str( + MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_MORNING_BLUE), + len); + break; + case XMB_THEME_SUNBEAM: + strlcpy(s, + msg_hash_to_str( + MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_SUNBEAM), + len); + break; + case XMB_THEME_LIME: + strlcpy(s, + msg_hash_to_str( + MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_LIME), + len); + break; + case XMB_THEME_MIDGAR: + strlcpy(s, + msg_hash_to_str( + MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_MIDGAR), + len); + break; + case XMB_THEME_PIKACHU_YELLOW: + strlcpy(s, + msg_hash_to_str( + MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_PIKACHU_YELLOW), + len); + break; + case XMB_THEME_GAMECUBE_PURPLE: + strlcpy(s, + msg_hash_to_str( + MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_GAMECUBE_PURPLE), + len); + break; + case XMB_THEME_FAMICOM_RED: + strlcpy(s, + msg_hash_to_str( + MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_FAMICOM_RED), + len); + break; + case XMB_THEME_FLAMING_HOT: + strlcpy(s, + msg_hash_to_str( + MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_FLAMING_HOT), + len); + break; + case XMB_THEME_ICE_COLD: + strlcpy(s, + msg_hash_to_str( + MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_ICE_COLD), + len); + break; + } +} #endif #ifdef HAVE_MATERIALUI @@ -4575,140 +4705,6 @@ static void setting_get_string_representation_uint_materialui_landscape_layout_o } #endif -#ifdef HAVE_XMB -static void setting_get_string_representation_uint_xmb_menu_color_theme( - rarch_setting_t *setting, - char *s, size_t len) -{ - if (!setting) - return; - - switch (*setting->value.target.unsigned_integer) - { - case XMB_THEME_WALLPAPER: - strlcpy(s, - msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_PLAIN), - len); - break; - case XMB_THEME_LEGACY_RED: - strlcpy(s, - msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_LEGACY_RED), - len); - break; - case XMB_THEME_DARK_PURPLE: - strlcpy(s, - msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_DARK_PURPLE), - len); - break; - case XMB_THEME_MIDNIGHT_BLUE: - strlcpy(s, - msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_MIDNIGHT_BLUE), - len); - break; - case XMB_THEME_GOLDEN: - strlcpy(s, - msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_GOLDEN), - len); - break; - case XMB_THEME_ELECTRIC_BLUE: - strlcpy(s, - msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_ELECTRIC_BLUE), - len); - break; - case XMB_THEME_APPLE_GREEN: - strlcpy(s, - msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_APPLE_GREEN), - len); - break; - case XMB_THEME_UNDERSEA: - strlcpy(s, - msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_UNDERSEA), - len); - break; - case XMB_THEME_VOLCANIC_RED: - strlcpy(s, - msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_VOLCANIC_RED), - len); - break; - case XMB_THEME_DARK: - strlcpy(s, - msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_DARK), - len); - break; - case XMB_THEME_LIGHT: - strlcpy(s, - msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_LIGHT), - len); - break; - case XMB_THEME_MORNING_BLUE: - strlcpy(s, - msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_MORNING_BLUE), - len); - break; - case XMB_THEME_SUNBEAM: - strlcpy(s, - msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_SUNBEAM), - len); - break; - case XMB_THEME_LIME: - strlcpy(s, - msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_LIME), - len); - break; - case XMB_THEME_MIDGAR: - strlcpy(s, - msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_MIDGAR), - len); - break; - case XMB_THEME_PIKACHU_YELLOW: - strlcpy(s, - msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_PIKACHU_YELLOW), - len); - break; - case XMB_THEME_GAMECUBE_PURPLE: - strlcpy(s, - msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_GAMECUBE_PURPLE), - len); - break; - case XMB_THEME_FAMICOM_RED: - strlcpy(s, - msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_FAMICOM_RED), - len); - break; - case XMB_THEME_FLAMING_HOT: - strlcpy(s, - msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_FLAMING_HOT), - len); - break; - case XMB_THEME_ICE_COLD: - strlcpy(s, - msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_ICE_COLD), - len); - break; - } -} -#endif - #ifdef HAVE_OZONE static void setting_get_string_representation_uint_ozone_menu_color_theme( rarch_setting_t *setting, @@ -6419,6 +6415,64 @@ static void setting_get_string_representation_netplay_mitm_server( { } + +static void setting_get_string_representation_netplay_share_digital( + rarch_setting_t *setting, + char *s, size_t len) +{ + if (!setting) + return; + + switch (*setting->value.target.unsigned_integer) + { + case RARCH_NETPLAY_SHARE_DIGITAL_NO_PREFERENCE: + strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_SHARE_NO_PREFERENCE), len); + break; + + case RARCH_NETPLAY_SHARE_DIGITAL_OR: + strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_SHARE_DIGITAL_OR), len); + break; + + case RARCH_NETPLAY_SHARE_DIGITAL_XOR: + strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_SHARE_DIGITAL_XOR), len); + break; + + case RARCH_NETPLAY_SHARE_DIGITAL_VOTE: + strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_SHARE_DIGITAL_VOTE), len); + break; + + default: + strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_SHARE_NONE), len); + break; + } +} + +static void setting_get_string_representation_netplay_share_analog( + rarch_setting_t *setting, + char *s, size_t len) +{ + if (!setting) + return; + + switch (*setting->value.target.unsigned_integer) + { + case RARCH_NETPLAY_SHARE_ANALOG_NO_PREFERENCE: + strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_SHARE_NO_PREFERENCE), len); + break; + + case RARCH_NETPLAY_SHARE_ANALOG_MAX: + strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_SHARE_ANALOG_MAX), len); + break; + + case RARCH_NETPLAY_SHARE_ANALOG_AVERAGE: + strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_SHARE_ANALOG_AVERAGE), len); + break; + + default: + strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_SHARE_NONE), len); + break; + } +} #endif static void setting_get_string_representation_toggle_gamepad_combo( @@ -6529,65 +6583,6 @@ static void setting_get_string_representation_turbo_default_button( } } -#ifdef HAVE_NETWORKING -static void setting_get_string_representation_netplay_share_digital( - rarch_setting_t *setting, - char *s, size_t len) -{ - if (!setting) - return; - - switch (*setting->value.target.unsigned_integer) - { - case RARCH_NETPLAY_SHARE_DIGITAL_NO_PREFERENCE: - strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_SHARE_NO_PREFERENCE), len); - break; - - case RARCH_NETPLAY_SHARE_DIGITAL_OR: - strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_SHARE_DIGITAL_OR), len); - break; - - case RARCH_NETPLAY_SHARE_DIGITAL_XOR: - strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_SHARE_DIGITAL_XOR), len); - break; - - case RARCH_NETPLAY_SHARE_DIGITAL_VOTE: - strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_SHARE_DIGITAL_VOTE), len); - break; - - default: - strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_SHARE_NONE), len); - break; - } -} - -static void setting_get_string_representation_netplay_share_analog( - rarch_setting_t *setting, - char *s, size_t len) -{ - if (!setting) - return; - - switch (*setting->value.target.unsigned_integer) - { - case RARCH_NETPLAY_SHARE_ANALOG_NO_PREFERENCE: - strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_SHARE_NO_PREFERENCE), len); - break; - - case RARCH_NETPLAY_SHARE_ANALOG_MAX: - strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_SHARE_ANALOG_MAX), len); - break; - - case RARCH_NETPLAY_SHARE_ANALOG_AVERAGE: - strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_SHARE_ANALOG_AVERAGE), len); - break; - - default: - strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_SHARE_NONE), len); - break; - } -} -#endif static void setting_get_string_representation_poll_type_behavior( rarch_setting_t *setting,