[vlc-commits] freetype: split font path defines

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Jun 25 17:03:31 2020 +0200| [ad03836f9e03d01c1f1df156a7041c140853ab3a] | committer: Francois Cartegnie

freetype: split font path defines

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ad03836f9e03d01c1f1df156a7041c140853ab3a
---

 modules/text_renderer/freetype/fonts/android.c  |  5 +--
 modules/text_renderer/freetype/platform_fonts.h | 49 ++++++++++++++-----------
 2 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/modules/text_renderer/freetype/fonts/android.c b/modules/text_renderer/freetype/fonts/android.c
index d6df816812..57555cdd80 100644
--- a/modules/text_renderer/freetype/fonts/android.c
+++ b/modules/text_renderer/freetype/fonts/android.c
@@ -45,7 +45,6 @@
 #define ANDROID_SYSTEM_FONTS_LEGACY  "file:///system/etc/system_fonts.xml"
 #define ANDROID_FALLBACK_FONTS       "file:///system/etc/fallback_fonts.xml"
 #define ANDROID_VENDOR_FONTS         "file:///vendor/etc/fallback_fonts.xml"
-#define ANDROID_FONT_PATH            "/system/fonts"
 
 static int Android_ParseFont( filter_t *p_filter, xml_reader_t *p_xml,
                               vlc_family_t *p_family )
@@ -83,7 +82,7 @@ static int Android_ParseFont( filter_t *p_filter, xml_reader_t *p_xml,
      * We don't need all font weights. Only 400 (regular) and 700 (bold)
      */
     if( i_weight == 400 || i_weight == 700 )
-        if( asprintf( &psz_fontfile, "%s/%s", ANDROID_FONT_PATH, psz_val ) < 0
+        if( asprintf( &psz_fontfile, "%s/%s", SYSTEM_FONT_PATH, psz_val ) < 0
          || !NewFont( psz_fontfile, 0, b_bold, b_italic, p_family ) )
             return VLC_ENOMEM;
 
@@ -327,7 +326,7 @@ static int Android_Legacy_ParseFamily( filter_t *p_filter, xml_reader_t *p_xml )
                 }
 
                 char *psz_fontfile = NULL;
-                if( asprintf( &psz_fontfile, "%s/%s", ANDROID_FONT_PATH, p_node ) < 0
+                if( asprintf( &psz_fontfile, "%s/%s", SYSTEM_FONT_PATH, p_node ) < 0
                  || !NewFont( psz_fontfile, 0, b_bold, b_italic, p_family ) )
                     return VLC_ENOMEM;
 
diff --git a/modules/text_renderer/freetype/platform_fonts.h b/modules/text_renderer/freetype/platform_fonts.h
index db06bd2035..4a38568586 100644
--- a/modules/text_renderer/freetype/platform_fonts.h
+++ b/modules/text_renderer/freetype/platform_fonts.h
@@ -55,34 +55,40 @@ extern "C" {
 
 /* Default fonts */
 #ifdef __APPLE__
-# define SYSTEM_DEFAULT_FONT_FILE "/System/Library/Fonts/HelveticaNeue.dfont"
-# define SYSTEM_DEFAULT_FAMILY "Helvetica Neue"
-# define SYSTEM_DEFAULT_MONOSPACE_FONT_FILE "/System/Library/Fonts/Monaco.dfont"
-# define SYSTEM_DEFAULT_MONOSPACE_FAMILY "Monaco"
+# define SYSTEM_FONT_PATH                   "/System/Library/Fonts"
+# define SYSTEM_DEFAULT_FONT_FILE           "HelveticaNeue.dfont"
+# define SYSTEM_DEFAULT_FAMILY              "Helvetica Neue"
+# define SYSTEM_DEFAULT_MONOSPACE_FONT_FILE "Monaco.dfont"
+# define SYSTEM_DEFAULT_MONOSPACE_FAMILY    "Monaco"
 #elif defined( _WIN32 )
-# define SYSTEM_DEFAULT_FONT_FILE "arial.ttf" /* Default path font found at run-time */
-# define SYSTEM_DEFAULT_FAMILY "Arial"
+# define SYSTEM_FONT_PATH                   "" /* Default path font found at run-time */
+# define SYSTEM_DEFAULT_FONT_FILE           "arial.ttf"
+# define SYSTEM_DEFAULT_FAMILY              "Arial"
 # define SYSTEM_DEFAULT_MONOSPACE_FONT_FILE "cour.ttf"
-# define SYSTEM_DEFAULT_MONOSPACE_FAMILY "Courier New"
+# define SYSTEM_DEFAULT_MONOSPACE_FAMILY    "Courier New"
 #elif defined( __OS2__ )
-# define SYSTEM_DEFAULT_FONT_FILE "/psfonts/tnrwt_k.ttf"
-# define SYSTEM_DEFAULT_FAMILY "Times New Roman WT K"
-# define SYSTEM_DEFAULT_MONOSPACE_FONT_FILE "/psfonts/mtsansdk.ttf"
-# define SYSTEM_DEFAULT_MONOSPACE_FAMILY "Monotype Sans Duospace WT K"
+# define SYSTEM_FONT_PATH                   "/psfonts"
+# define SYSTEM_DEFAULT_FONT_FILE           "tnrwt_k.ttf"
+# define SYSTEM_DEFAULT_FAMILY              "Times New Roman WT K"
+# define SYSTEM_DEFAULT_MONOSPACE_FONT_FILE "mtsansdk.ttf"
+# define SYSTEM_DEFAULT_MONOSPACE_FAMILY    "Monotype Sans Duospace WT K"
 #elif defined( __ANDROID__ )
-# define SYSTEM_DEFAULT_FONT_FILE "/system/fonts/Roboto-Regular.ttf"
-# define SYSTEM_DEFAULT_FAMILY "sans-serif"
-# define SYSTEM_DEFAULT_MONOSPACE_FONT_FILE "/system/fonts/DroidSansMono.ttf"
-# define SYSTEM_DEFAULT_MONOSPACE_FAMILY "Monospace"
+# define SYSTEM_FONT_PATH                   "/system/fonts"
+# define SYSTEM_DEFAULT_FONT_FILE           "Roboto-Regular.ttf"
+# define SYSTEM_DEFAULT_FAMILY              "sans-serif"
+# define SYSTEM_DEFAULT_MONOSPACE_FONT_FILE "DroidSansMono.ttf"
+# define SYSTEM_DEFAULT_MONOSPACE_FAMILY    "Monospace"
 #else
-# define SYSTEM_DEFAULT_FONT_FILE "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf"
-# define SYSTEM_DEFAULT_FAMILY "Serif Bold"
-# define SYSTEM_DEFAULT_MONOSPACE_FONT_FILE "/usr/share/fonts/truetype/freefont/FreeMono.ttf"
-# define SYSTEM_DEFAULT_MONOSPACE_FAMILY "Monospace"
+# define SYSTEM_FONT_PATH                   "/usr/share/fonts/truetype/freefont"
+# define SYSTEM_DEFAULT_FONT_FILE           "FreeSerifBold.ttf"
+# define SYSTEM_DEFAULT_FAMILY              "Serif Bold"
+# define SYSTEM_DEFAULT_MONOSPACE_FONT_FILE "FreeMono.ttf"
+# define SYSTEM_DEFAULT_MONOSPACE_FAMILY    "Monospace"
 #endif
 
 #ifndef DEFAULT_FONT_FILE
-# define DEFAULT_FONT_FILE SYSTEM_DEFAULT_FONT_FILE
+# define DEFAULT_FONT_FILE \
+    SYSTEM_FONT_PATH DIR_SEP SYSTEM_DEFAULT_FONT_FILE
 #endif
 
 #ifndef DEFAULT_FAMILY
@@ -90,7 +96,8 @@ extern "C" {
 #endif
 
 #ifndef DEFAULT_MONOSPACE_FONT_FILE
-# define DEFAULT_MONOSPACE_FONT_FILE SYSTEM_DEFAULT_MONOSPACE_FONT_FILE
+# define DEFAULT_MONOSPACE_FONT_FILE \
+    SYSTEM_FONT_PATH DIR_SEP SYSTEM_DEFAULT_MONOSPACE_FONT_FILE
 #endif
 
 #ifndef DEFAULT_MONOSPACE_FAMILY