ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(XMB) Prevent symbol collission

This commit is contained in:
twinaphex 2016-03-21 21:18:25 +01:00
parent cf0dd7f5e8
commit 7b48a0c57e
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
menu/drivers/xmb.c
View File

@ -227,7 +227,7 @@ typedef struct xmb_handle
gfx_font_raster_block_t raster_block; gfx_font_raster_block_t raster_block;
} xmb_handle_t; } xmb_handle_t;
static char* xmb_theme() static char* xmb_theme_ident(void)
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
switch (settings->menu.xmb_theme) switch (settings->menu.xmb_theme)
@ -239,8 +239,10 @@ static char* xmb_theme()
case 2: case 2:
return "custom"; return "custom";
default: default:
return "monochrome"; break;
} }
return "monochrome";
} }
static void xmb_fill_default_background_path(xmb_handle_t *xmb, static void xmb_fill_default_background_path(xmb_handle_t *xmb,
@ -255,7 +257,7 @@ static void xmb_fill_default_background_path(xmb_handle_t *xmb,
fill_pathname_join(mediapath, settings->assets_directory, fill_pathname_join(mediapath, settings->assets_directory,
"xmb", sizeof(mediapath)); "xmb", sizeof(mediapath));
fill_pathname_join(themepath, mediapath, xmb_theme(), sizeof(themepath)); fill_pathname_join(themepath, mediapath, xmb_theme_ident(), sizeof(themepath));
fill_pathname_join(iconpath, themepath, xmb->icon.dir, sizeof(iconpath)); fill_pathname_join(iconpath, themepath, xmb->icon.dir, sizeof(iconpath));
fill_pathname_slash(iconpath, sizeof(iconpath)); fill_pathname_slash(iconpath, sizeof(iconpath));
@ -1277,7 +1279,7 @@ static void xmb_refresh_horizontal_list(xmb_handle_t *xmb)
fill_pathname_join(mediapath, settings->assets_directory, fill_pathname_join(mediapath, settings->assets_directory,
"xmb", sizeof(mediapath)); "xmb", sizeof(mediapath));
fill_pathname_join(themepath, mediapath, xmb_theme(), sizeof(themepath)); fill_pathname_join(themepath, mediapath, xmb_theme_ident(), sizeof(themepath));
xmb_context_destroy_horizontal_list(xmb); xmb_context_destroy_horizontal_list(xmb);
if (xmb->horizontal_list) if (xmb->horizontal_list)
@ -2074,7 +2076,7 @@ static void xmb_font(xmb_handle_t *xmb)
fill_pathname_join(mediapath, fill_pathname_join(mediapath,
settings->assets_directory, "xmb", sizeof(mediapath)); settings->assets_directory, "xmb", sizeof(mediapath));
fill_pathname_join(themepath, fill_pathname_join(themepath,
mediapath, xmb_theme(), sizeof(themepath)); mediapath, xmb_theme_ident(), sizeof(themepath));
if (string_is_empty(settings->menu.xmb_font)) if (string_is_empty(settings->menu.xmb_font))
fill_pathname_join(fontpath, themepath, "font.ttf", sizeof(fontpath)); fill_pathname_join(fontpath, themepath, "font.ttf", sizeof(fontpath));
else else
@ -2496,7 +2498,7 @@ static void xmb_context_reset(void *data)
fill_pathname_join(mediapath, settings->assets_directory, fill_pathname_join(mediapath, settings->assets_directory,
"xmb", sizeof(mediapath)); "xmb", sizeof(mediapath));
fill_pathname_join(themepath, mediapath, xmb_theme(), sizeof(themepath)); fill_pathname_join(themepath, mediapath, xmb_theme_ident(), sizeof(themepath));
fill_pathname_join(iconpath, themepath, xmb->icon.dir, sizeof(iconpath)); fill_pathname_join(iconpath, themepath, xmb->icon.dir, sizeof(iconpath));
fill_pathname_slash(iconpath, sizeof(iconpath)); fill_pathname_slash(iconpath, sizeof(iconpath));