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

Use fill_pathname_application_path

This commit is contained in:
twinaphex 2016-06-11 19:46:37 +02:00
parent ecb5c1adc0
commit c254c69c1a
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
file_path_special.c
View File

@ -299,6 +299,19 @@ void fill_pathname_application_directory(char *s, size_t len, enum application_d
s1, xmb_theme_ident(), sizeof(s2)); s1, xmb_theme_ident(), sizeof(s2));
strlcpy(s, s2, len); strlcpy(s, s2, len);
} }
#endif
break;
case APPLICATION_DIRECTORY_ASSETS_MATERIALUI:
#ifdef HAVE_MATERIALUI
{
settings_t *settings = config_get_ptr();
fill_pathname_join(
s,
settings->directory.assets,
"glui",
len);
}
#endif #endif
break; break;
case APPLICATION_DIRECTORY_ASSETS_MATERIALUI_ICONS: case APPLICATION_DIRECTORY_ASSETS_MATERIALUI_ICONS:
@ -306,11 +319,9 @@ void fill_pathname_application_directory(char *s, size_t len, enum application_d
{ {
char s1[PATH_MAX_LENGTH] = {0}; char s1[PATH_MAX_LENGTH] = {0};
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
fill_pathname_join(
s1, fill_pathname_application_directory(s1,
settings->directory.assets, sizeof(s1), APPLICATION_DIRECTORY_ASSETS_MATERIALUI);
"glui",
sizeof(s1));
fill_pathname_slash(s1, sizeof(s1)); fill_pathname_slash(s1, sizeof(s1));
strlcpy(s, s1, len); strlcpy(s, s1, len);
} }

1
file_path_special.h
View File

@ -25,6 +25,7 @@
enum application_directory enum application_directory
{ {
APPLICATION_DIRECTORY_NONE = 0, APPLICATION_DIRECTORY_NONE = 0,
APPLICATION_DIRECTORY_ASSETS_MATERIALUI,
APPLICATION_DIRECTORY_ASSETS_MATERIALUI_ICONS, APPLICATION_DIRECTORY_ASSETS_MATERIALUI_ICONS,
APPLICATION_DIRECTORY_ASSETS_XMB, APPLICATION_DIRECTORY_ASSETS_XMB,
APPLICATION_DIRECTORY_ASSETS_XMB_ICONS APPLICATION_DIRECTORY_ASSETS_XMB_ICONS

4
menu/drivers/materialui.c
View File

@ -1010,8 +1010,8 @@ static void mui_font(void)
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
int font_size = menu_display_get_font_size(); int font_size = menu_display_get_font_size();
fill_pathname_join(mediapath, settings->directory.assets, fill_pathname_application_directory(mediapath, sizeof(mediapath),
"glui", sizeof(mediapath)); APPLICATION_DIRECTORY_ASSETS_MATERIALUI);
fill_pathname_join(fontpath, mediapath, fill_pathname_join(fontpath, mediapath,
"Roboto-Regular.ttf", sizeof(fontpath)); "Roboto-Regular.ttf", sizeof(fontpath));