diff options
| author | greg <greg@blackbox> | 2009-06-19 05:33:40 +0200 |
|---|---|---|
| committer | greg <greg@blackbox> | 2009-06-20 03:38:00 +0200 |
| commit | 4600a9a40e82d9583e6b99a6633cadd379b8aa93 (patch) | |
| tree | 665e0f43a182cee9c8ed6f0d1954b42617fedfdd | |
| parent | c27e45dbb756d89124df72acf07a5856abb15ae1 (diff) | |
| download | libass-4600a9a40e82d9583e6b99a6633cadd379b8aa93.tar.bz2 libass-4600a9a40e82d9583e6b99a6633cadd379b8aa93.tar.xz | |
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.
| -rw-r--r-- | libass/ass.h | 1 | ||||
| -rw-r--r-- | libass/ass_render.c | 19 | ||||
| -rw-r--r-- | test/test.cpp | 2 |
3 files changed, 4 insertions, 18 deletions
diff --git a/libass/ass.h b/libass/ass.h index f5a989a..238a33c 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 c566409..d3158f6 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 */ diff --git a/test/test.cpp b/test/test.cpp index 57f39af..20ea0fa 100644 --- 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) { |