From 5985d99466a87d68c3fa56c39a9b3a954843950b Mon Sep 17 00:00:00 2001 From: parport0 Date: Sun, 28 Jun 2020 15:59:07 +0300 Subject: [PATCH] Uncomment bluetooth.png --- menu/drivers/ozone/ozone_texture.c | 7 ++----- menu/drivers/ozone/ozone_texture.h | 2 -- menu/drivers/stripes.c | 6 ------ menu/drivers/xmb.c | 9 ++------- 4 files changed, 4 insertions(+), 20 deletions(-) diff --git a/menu/drivers/ozone/ozone_texture.c b/menu/drivers/ozone/ozone_texture.c index 8f8cbf8a2c..a1d233e873 100644 --- a/menu/drivers/ozone/ozone_texture.c +++ b/menu/drivers/ozone/ozone_texture.c @@ -263,11 +263,12 @@ uintptr_t ozone_entries_icon_get_texture(ozone_handle_t *ozone, return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_ACHIEVEMENTS]; case MENU_ENUM_LABEL_NETWORK_INFORMATION: case MENU_ENUM_LABEL_NETWORK_SETTINGS: - case MENU_ENUM_LABEL_BLUETOOTH_SETTINGS: case MENU_ENUM_LABEL_WIFI_SETTINGS: case MENU_ENUM_LABEL_NETWORK_INFO_ENTRY: case MENU_ENUM_LABEL_NETWORK_HOSTING_SETTINGS: return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_NETWORK]; + case MENU_ENUM_LABEL_BLUETOOTH_SETTINGS: + return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_BLUETOOTH]; case MENU_ENUM_LABEL_PLAYLIST_SETTINGS: return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_PLAYLIST]; case MENU_ENUM_LABEL_USER_SETTINGS: @@ -412,10 +413,8 @@ uintptr_t ozone_entries_icon_get_texture(ozone_handle_t *ozone, #endif case MENU_INFO_MESSAGE: return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_CORE_INFO]; -#if 0 case MENU_BLUETOOTH: return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_BLUETOOTH]; -#endif case MENU_WIFI: return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_WIFI]; #ifdef HAVE_NETWORKING @@ -598,10 +597,8 @@ switch (id) return "undo.png"; case OZONE_ENTRIES_ICONS_TEXTURE_CORE_INFO: return "core-infos.png"; -#if 0 case OZONE_ENTRIES_ICONS_TEXTURE_BLUETOOTH: return "bluetooth.png"; -#endif case OZONE_ENTRIES_ICONS_TEXTURE_WIFI: return "wifi.png"; case OZONE_ENTRIES_ICONS_TEXTURE_CORE_OPTIONS: diff --git a/menu/drivers/ozone/ozone_texture.h b/menu/drivers/ozone/ozone_texture.h index 931fd0b992..d2c3f328b9 100644 --- a/menu/drivers/ozone/ozone_texture.h +++ b/menu/drivers/ozone/ozone_texture.h @@ -90,9 +90,7 @@ enum OZONE_ENTRIES_ICONS_TEXTURE_LOADSTATE, OZONE_ENTRIES_ICONS_TEXTURE_UNDO, OZONE_ENTRIES_ICONS_TEXTURE_CORE_INFO, -#if 0 OZONE_ENTRIES_ICONS_TEXTURE_BLUETOOTH, -#endif OZONE_ENTRIES_ICONS_TEXTURE_WIFI, OZONE_ENTRIES_ICONS_TEXTURE_CORE_OPTIONS, OZONE_ENTRIES_ICONS_TEXTURE_INPUT_REMAPPING_OPTIONS, diff --git a/menu/drivers/stripes.c b/menu/drivers/stripes.c index a39483b55c..be19e5c9be 100644 --- a/menu/drivers/stripes.c +++ b/menu/drivers/stripes.c @@ -123,9 +123,7 @@ enum STRIPES_TEXTURE_LOADSTATE, STRIPES_TEXTURE_UNDO, STRIPES_TEXTURE_CORE_INFO, -#if 0 STRIPES_TEXTURE_BLUETOOTH, -#endif STRIPES_TEXTURE_WIFI, STRIPES_TEXTURE_CORE_OPTIONS, STRIPES_TEXTURE_INPUT_REMAPPING_OPTIONS, @@ -2283,10 +2281,8 @@ static uintptr_t stripes_icon_get_id(stripes_handle_t *stripes, return stripes->textures.list[STRIPES_TEXTURE_SETTING]; case MENU_INFO_MESSAGE: return stripes->textures.list[STRIPES_TEXTURE_CORE_INFO]; -#if 0 case MENU_BLUETOOTH: return stripes->textures.list[STRIPES_TEXTURE_BLUETOOTH]; -#endif case MENU_WIFI: return stripes->textures.list[STRIPES_TEXTURE_WIFI]; #ifdef HAVE_NETWORKING @@ -3627,10 +3623,8 @@ static const char *stripes_texture_path(unsigned id) return "undo.png"; case STRIPES_TEXTURE_CORE_INFO: return "core-infos.png"; -#if 0 case STRIPES_TEXTURE_BLUETOOTH: return "bluetooth.png"; -#endif case STRIPES_TEXTURE_WIFI: return "wifi.png"; case STRIPES_TEXTURE_CORE_OPTIONS: diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index cb68646a0b..88b8404475 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -131,9 +131,7 @@ enum XMB_TEXTURE_LOADSTATE, XMB_TEXTURE_UNDO, XMB_TEXTURE_CORE_INFO, -#if 0 XMB_TEXTURE_BLUETOOTH, -#endif XMB_TEXTURE_WIFI, XMB_TEXTURE_CORE_OPTIONS, XMB_TEXTURE_INPUT_REMAPPING_OPTIONS, @@ -2693,12 +2691,13 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb, return xmb->textures.list[XMB_TEXTURE_RELOAD]; case MENU_ENUM_LABEL_NETWORK_INFORMATION: case MENU_ENUM_LABEL_NETWORK_SETTINGS: - case MENU_ENUM_LABEL_BLUETOOTH_SETTINGS: case MENU_ENUM_LABEL_WIFI_SETTINGS: case MENU_ENUM_LABEL_NETWORK_INFO_ENTRY: case MENU_ENUM_LABEL_NETWORK_HOSTING_SETTINGS: return xmb->textures.list[XMB_TEXTURE_NETWORK]; #endif + case MENU_ENUM_LABEL_BLUETOOTH_SETTINGS: + return xmb->textures.list[XMB_TEXTURE_BLUETOOTH]; case MENU_ENUM_LABEL_SHUTDOWN: return xmb->textures.list[XMB_TEXTURE_SHUTDOWN]; case MENU_ENUM_LABEL_CHEAT_APPLY_CHANGES: @@ -2814,10 +2813,8 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb, return xmb->textures.list[XMB_TEXTURE_SETTING]; case MENU_INFO_MESSAGE: return xmb->textures.list[XMB_TEXTURE_CORE_INFO]; -#if 0 case MENU_BLUETOOTH: return xmb->textures.list[XMB_TEXTURE_BLUETOOTH]; -#endif case MENU_WIFI: return xmb->textures.list[XMB_TEXTURE_WIFI]; #ifdef HAVE_NETWORKING @@ -5636,10 +5633,8 @@ static const char *xmb_texture_path(unsigned id) return "undo.png"; case XMB_TEXTURE_CORE_INFO: return "core-infos.png"; -#if 0 case XMB_TEXTURE_BLUETOOTH: return "bluetooth.png"; -#endif case XMB_TEXTURE_WIFI: return "wifi.png"; case XMB_TEXTURE_CORE_OPTIONS: