From 6dd52d9bb1bcf209d759d256666ea02c9a36bc63 Mon Sep 17 00:00:00 2001 From: LibretroAdmin Date: Tue, 2 Aug 2022 18:05:51 +0200 Subject: [PATCH] Get rid of more boilerplate code in file_path_special.c --- file_path_special.c | 19 ++++++------------- file_path_special.h | 3 --- gfx/gfx_widgets.c | 6 +++--- menu/drivers/materialui.c | 12 ++++++------ menu/drivers/ozone.c | 31 ++++++++++++++++--------------- 5 files changed, 31 insertions(+), 40 deletions(-) diff --git a/file_path_special.c b/file_path_special.c index 39b1b9d05e..666f31abdc 100644 --- a/file_path_special.c +++ b/file_path_special.c @@ -164,13 +164,6 @@ void fill_pathname_application_special(char *s, fill_pathname_basedir(s, path_get(RARCH_PATH_CONFIG), len); } break; - case APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG: - { - settings_t *settings = config_get_ptr(); - const char *dir_assets = settings->paths.directory_assets; - fill_pathname_join(s, dir_assets, "pkg", len); - } - break; case APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB_ICONS: #ifdef HAVE_XMB { @@ -348,19 +341,19 @@ void fill_pathname_application_special(char *s, { case RETRO_LANGUAGE_ARABIC: case RETRO_LANGUAGE_PERSIAN: - fill_pathname_application_special(s1, sizeof(s1), - APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG); + fill_pathname_join(s1, + settings->paths.directory_assets, "pkg", sizeof(s1)); fill_pathname_join(s, s1, "fallback-font.ttf", len); break; case RETRO_LANGUAGE_CHINESE_SIMPLIFIED: case RETRO_LANGUAGE_CHINESE_TRADITIONAL: - fill_pathname_application_special(s1, sizeof(s1), - APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG); + fill_pathname_join(s1, + settings->paths.directory_assets, "pkg", sizeof(s1)); fill_pathname_join(s, s1, "chinese-fallback-font.ttf", len); break; case RETRO_LANGUAGE_KOREAN: - fill_pathname_application_special(s1, sizeof(s1), - APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG); + fill_pathname_join(s1, + settings->paths.directory_assets, "pkg", sizeof(s1)); fill_pathname_join(s, s1, "korean-fallback-font.ttf", len); break; default: diff --git a/file_path_special.h b/file_path_special.h index 85d017943e..60449a4feb 100644 --- a/file_path_special.h +++ b/file_path_special.h @@ -120,9 +120,6 @@ enum application_special_type { APPLICATION_SPECIAL_NONE = 0, APPLICATION_SPECIAL_DIRECTORY_CONFIG, - APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG, - APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG_AR_FONT, - APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG_CJK_FONT, APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB, APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB_BG, APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB_ICONS, diff --git a/gfx/gfx_widgets.c b/gfx/gfx_widgets.c index b04519ce21..5699b98511 100644 --- a/gfx/gfx_widgets.c +++ b/gfx/gfx_widgets.c @@ -2054,9 +2054,9 @@ bool gfx_widgets_init( "png", sizeof(p_dispwidget->monochrome_png_path) ); - fill_pathname_application_special( - p_dispwidget->assets_pkg_dir, sizeof(p_dispwidget->assets_pkg_dir), - APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG); + fill_pathname_join(p_dispwidget->assets_pkg_dir, + settings->paths.directory_assets, "pkg", + sizeof(p_dispwidget->assets_pkg_dir)); p_dispwidget->inited = true; } diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c index 5b20d244ed..16c2fa2712 100644 --- a/menu/drivers/materialui.c +++ b/menu/drivers/materialui.c @@ -7749,21 +7749,21 @@ static void materialui_init_font( { case RETRO_LANGUAGE_ARABIC: case RETRO_LANGUAGE_PERSIAN: - fill_pathname_application_special(s1, sizeof(s1), - APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG); + fill_pathname_join(s1, + settings->paths.directory_assets, "pkg", sizeof(s1)); fill_pathname_join(fontpath, s1, "fallback-font.ttf", sizeof(fontpath)); break; case RETRO_LANGUAGE_CHINESE_SIMPLIFIED: case RETRO_LANGUAGE_CHINESE_TRADITIONAL: - fill_pathname_application_special(s1, sizeof(s1), - APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG); + fill_pathname_join(s1, + settings->paths.directory_assets, "pkg", sizeof(s1)); fill_pathname_join(fontpath, s1, "chinese-fallback-font.ttf", sizeof(fontpath)); break; case RETRO_LANGUAGE_KOREAN: - fill_pathname_application_special(s1, sizeof(s1), - APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG); + fill_pathname_join(s1, + settings->paths.directory_assets, "pkg", sizeof(s1)); fill_pathname_join(fontpath, s1, "korean-fallback-font.ttf", sizeof(fontpath)); break; diff --git a/menu/drivers/ozone.c b/menu/drivers/ozone.c index b4a352f302..7fa03c3201 100644 --- a/menu/drivers/ozone.c +++ b/menu/drivers/ozone.c @@ -8057,10 +8057,11 @@ static void ozone_set_layout( { char s1[PATH_MAX_LENGTH]; char font_path[PATH_MAX_LENGTH]; - bool font_inited = false; - float scale_factor = ozone->last_scale_factor; + settings_t *settings = config_get_ptr(); + bool font_inited = false; + float scale_factor = ozone->last_scale_factor; - s1[0] = '\0'; + s1[0] = '\0'; /* Calculate dimensions */ ozone->dimensions.header_height = HEADER_HEIGHT * scale_factor; @@ -8119,19 +8120,19 @@ static void ozone_set_layout( { case RETRO_LANGUAGE_ARABIC: case RETRO_LANGUAGE_PERSIAN: - fill_pathname_application_special(s1, sizeof(s1), - APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG); + fill_pathname_join(s1, + settings->paths.directory_assets, "pkg", sizeof(s1)); fill_pathname_join(font_path, s1, "fallback-font.ttf", sizeof(font_path)); break; case RETRO_LANGUAGE_CHINESE_SIMPLIFIED: case RETRO_LANGUAGE_CHINESE_TRADITIONAL: - fill_pathname_application_special(s1, sizeof(s1), - APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG); + fill_pathname_join(s1, + settings->paths.directory_assets, "pkg", sizeof(s1)); fill_pathname_join(font_path, s1, "chinese-fallback-font.ttf", sizeof(font_path)); break; case RETRO_LANGUAGE_KOREAN: - fill_pathname_application_special(s1, sizeof(s1), - APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG); + fill_pathname_join(s1, + settings->paths.directory_assets, "pkg", sizeof(s1)); fill_pathname_join(font_path, s1, "korean-fallback-font.ttf", sizeof(font_path)); break; default: @@ -8146,19 +8147,19 @@ static void ozone_set_layout( { case RETRO_LANGUAGE_ARABIC: case RETRO_LANGUAGE_PERSIAN: - fill_pathname_application_special(s1, sizeof(s1), - APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG); + fill_pathname_join(s1, + settings->paths.directory_assets, "pkg", sizeof(s1)); fill_pathname_join(font_path, s1, "fallback-font.ttf", sizeof(font_path)); break; case RETRO_LANGUAGE_CHINESE_SIMPLIFIED: case RETRO_LANGUAGE_CHINESE_TRADITIONAL: - fill_pathname_application_special(s1, sizeof(s1), - APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG); + fill_pathname_join(s1, + settings->paths.directory_assets, "pkg", sizeof(s1)); fill_pathname_join(font_path, s1, "chinese-fallback-font.ttf", sizeof(font_path)); break; case RETRO_LANGUAGE_KOREAN: - fill_pathname_application_special(s1, sizeof(s1), - APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG); + fill_pathname_join(s1, + settings->paths.directory_assets, "pkg", sizeof(s1)); fill_pathname_join(font_path, s1, "korean-fallback-font.ttf", sizeof(font_path)); break; default: