From 4600a9a40e82d9583e6b99a6633cadd379b8aa93 Mon Sep 17 00:00:00 2001
From: greg <greg@blackbox>
Date: Fri, 19 Jun 2009 05:33:40 +0200
Subject: 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.
---
 libass/ass.h        |  1 +
 libass/ass_render.c | 19 ++-----------------
 2 files changed, 3 insertions(+), 17 deletions(-)

(limited to 'libass')

diff --git a/libass/ass.h b/libass/ass.h
index f5a989a7..238a33ca 100644
--- 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 c5664093..d3158f6e 100644
--- 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
  */
-- 
cgit v1.2.3