Remove wrappers for ass_set_fonts

ass_set_fonts_ was wrapped through ass_set_fonts and ass_set_fonts_nofc
to either use fontconfig or not. This is not very useful, since a simple
parameter to ass_set_fonts_ can be used instead. Remove the wrapper
functions and rename the real function to ass_set_fonts.

This changes the public API.

diff --git a/libass/ass.h b/libass/ass.h
index f5a989a7fe21b86611a3b30c1d8e48e265b954d2..238a33caae2a01702df762a98be86f24bf04f267 100644 (file)
--- a/libass/ass.h
+++ b/libass/ass.h
@@ -90,6 +90,7 @@ void ass_set_line_spacing(ass_renderer_t *priv, double line_spacing);
 
 /**
  * \brief set font lookup defaults
+ * \param fc bool, use fontconfig?
  */
 int ass_set_fonts(ass_renderer_t *priv, const char *default_font,
                   const char *default_family, int fc);

diff --git a/libass/ass_render.c b/libass/ass_render.c
index c5664093cd458ef42d3d83821878867ab5fd1cab..d3158f6e24f5d06f0b41c53dda5163f0294f0244 100644 (file)
--- a/libass/ass_render.c
+++ b/libass/ass_render.c
@@ -2640,9 +2640,8 @@ void ass_set_line_spacing(ass_renderer_t *priv, double line_spacing)
     priv->settings.line_spacing = line_spacing;
 }
 
-static int
-ass_set_fonts_(ass_renderer_t *priv, const char *default_font,
-               const char *default_family, int fc)
+int ass_set_fonts(ass_renderer_t *priv, const char *default_font,
+                  const char *default_family, int fc)
 {
     if (priv->settings.default_font)
         free(priv->settings.default_font);
@@ -2662,20 +2661,6 @@ ass_set_fonts_(ass_renderer_t *priv, const char *default_font,
     return !!priv->fontconfig_priv;
 }
 
-int
-ass_set_fonts(ass_renderer_t *priv, const char *default_font,
-              const char *default_family)
-{
-    return ass_set_fonts_(priv, default_font, default_family, 1);
-}
-
-int
-ass_set_fonts_nofc(ass_renderer_t *priv, const char *default_font,
-                   const char *default_family)
-{
-    return ass_set_fonts_(priv, default_font, default_family, 0);
-}
-
 /**
  * \brief Start a new frame
  */

diff --git a/test/test.cpp b/test/test.cpp
index 57f39afe1e722622516624e3fdbb52d05cc3dd5b..20ea0faa0023f6f64ddfec58b116b42165cc2096 100644 (file)
--- a/test/test.cpp
+++ b/test/test.cpp
@@ -79,7 +79,7 @@ static void init(int frame_w, int frame_h) {
   ass_set_margins(ass_renderer, 0, 0, 0, 0);
   ass_set_use_margins(ass_renderer, 0);
   ass_set_font_scale(ass_renderer, 1.);
-  ass_set_fonts(ass_renderer, NULL, "Sans");
+  ass_set_fonts(ass_renderer, NULL, "Sans", 1);
 }
 
 static image_t* gen_image(int width, int height) {