mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-11 00:44:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7968 from fr500/master

Browse Source 
disable discord code in ozone
This commit is contained in:
Twinaphex 2019-01-10 15:16:05 +01:00 committed by GitHub
commit 6ec2134111
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
menu/drivers/ozone/ozone.c
View File

@ -23,7 +23,7 @@
#include "ozone_texture.h" #include "ozone_texture.h"
#include "ozone_sidebar.h" #include "ozone_sidebar.h"
#ifdef HAVE_DISCORD #if 0
#include "discord/discord.h" #include "discord/discord.h"
#endif #endif
@ -352,8 +352,8 @@ static void ozone_context_reset(void *data, bool is_threaded)
for (i = 0; i < OZONE_TEXTURE_LAST; i++) for (i = 0; i < OZONE_TEXTURE_LAST; i++)
{ {
char filename[PATH_MAX_LENGTH]; char filename[PATH_MAX_LENGTH];
#ifdef HAVE_DISCORD #if 0
if (i == OZONE_TEXTURE_DISCORD_OWN_AVATAR) if (i == OZONE_TEXTURE_DISCORD_OWN_AVATAR && discord_avatar_is_ready())
strlcpy(filename, discord_get_own_avatar(), sizeof(filename)); strlcpy(filename, discord_get_own_avatar(), sizeof(filename));
else else
#endif #endif
@ -361,7 +361,7 @@ static void ozone_context_reset(void *data, bool is_threaded)
strlcat(filename, ".png", sizeof(filename)); strlcat(filename, ".png", sizeof(filename));
#ifdef HAVE_DISCORD #if 0
if (i == OZONE_TEXTURE_DISCORD_OWN_AVATAR && discord_avatar_is_ready()) if (i == OZONE_TEXTURE_DISCORD_OWN_AVATAR && discord_avatar_is_ready())
{ {
char buf[PATH_MAX_LENGTH]; char buf[PATH_MAX_LENGTH];
@ -379,7 +379,7 @@ static void ozone_context_reset(void *data, bool is_threaded)
ozone->has_all_assets = false; ozone->has_all_assets = false;
RARCH_WARN("[OZONE] Asset missing: %s%s%s\n", ozone->png_path, path_default_slash(), filename); RARCH_WARN("[OZONE] Asset missing: %s%s%s\n", ozone->png_path, path_default_slash(), filename);
} }
#ifdef HAVE_DISCORD #if 0
} }
#endif #endif
} }
@ -956,7 +956,7 @@ static void ozone_draw_header(ozone_handle_t *ozone, video_frame_info_t *video_i
/* Icon */ /* Icon */
menu_display_blend_begin(video_info); menu_display_blend_begin(video_info);
#ifdef HAVE_DISCORD #if 0
if (discord_avatar_is_ready()) if (discord_avatar_is_ready())
ozone_draw_icon(video_info, 60, 60, ozone->textures[OZONE_TEXTURE_DISCORD_OWN_AVATAR], 47, 14, video_info->width, video_info->height, 0, 1, ozone->theme->entries_icon); ozone_draw_icon(video_info, 60, 60, ozone->textures[OZONE_TEXTURE_DISCORD_OWN_AVATAR], 47, 14, video_info->width, video_info->height, 0, 1, ozone->theme->entries_icon);
else else
@ -1148,7 +1148,7 @@ static void ozone_frame(void *data, video_frame_info_t *video_info)
bool draw_osk = menu_input_dialog_get_display_kb(); bool draw_osk = menu_input_dialog_get_display_kb();
static bool draw_osk_old = false; static bool draw_osk_old = false;
#ifdef HAVE_DISCORD #if 0
static bool reset = false; static bool reset = false;
if (discord_avatar_is_ready() && !reset) if (discord_avatar_is_ready() && !reset)

2
menu/drivers/ozone/ozone_texture.h
View File

@ -28,7 +28,7 @@
enum OZONE_TEXTURE { enum OZONE_TEXTURE {
OZONE_TEXTURE_RETROARCH = 0, OZONE_TEXTURE_RETROARCH = 0,
OZONE_TEXTURE_CURSOR_BORDER, OZONE_TEXTURE_CURSOR_BORDER,
#ifdef HAVE_DISCORD #if 0
OZONE_TEXTURE_DISCORD_OWN_AVATAR, OZONE_TEXTURE_DISCORD_OWN_AVATAR,
#endif #endif
OZONE_TEXTURE_LAST OZONE_TEXTURE_LAST