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

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));
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
break;
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};
settings_t *settings = config_get_ptr();
fill_pathname_join(
s1,
settings->directory.assets,
"glui",
sizeof(s1));
fill_pathname_application_directory(s1,
sizeof(s1), APPLICATION_DIRECTORY_ASSETS_MATERIALUI);
fill_pathname_slash(s1, sizeof(s1));
strlcpy(s, s1, len);
}

View File

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

View File

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