From e51a229b1f7cb23272d3152f9d9d4c964e7fbd7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= Date: Tue, 24 Apr 2018 21:01:54 +0300 Subject: [PATCH] config: remove advanced from add_font() --- include/vlc_plugin.h | 2 +- modules/text_renderer/freetype/freetype.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/vlc_plugin.h b/include/vlc_plugin.h index 6f7c2565d5..a2ed57c2cd 100644 --- a/include/vlc_plugin.h +++ b/include/vlc_plugin.h @@ -382,7 +382,7 @@ VLC_METADATA_EXPORTS #define add_directory(name, value, text, longtext) \ add_string_inner(CONFIG_ITEM_DIRECTORY, name, text, longtext, value) -#define add_font( name, value, text, longtext, advc )\ +#define add_font(name, value, text, longtext) \ add_string_inner(CONFIG_ITEM_FONT, name, text, longtext, value) #define add_module( name, psz_caps, value, text, longtext, advc ) \ diff --git a/modules/text_renderer/freetype/freetype.c b/modules/text_renderer/freetype/freetype.c index 13999297da..7eb8699229 100644 --- a/modules/text_renderer/freetype/freetype.c +++ b/modules/text_renderer/freetype/freetype.c @@ -148,8 +148,9 @@ vlc_module_begin () set_subcategory( SUBCAT_VIDEO_SUBPIC ) #ifdef HAVE_GET_FONT_BY_FAMILY_NAME - add_font( "freetype-font", DEFAULT_FAMILY, FONT_TEXT, FAMILY_LONGTEXT, false ) - add_font( "freetype-monofont", DEFAULT_MONOSPACE_FAMILY, MONOSPACE_FONT_TEXT, FAMILY_LONGTEXT, false ) + add_font("freetype-font", DEFAULT_FAMILY, FONT_TEXT, FAMILY_LONGTEXT) + add_font("freetype-monofont", DEFAULT_MONOSPACE_FAMILY, + MONOSPACE_FONT_TEXT, FAMILY_LONGTEXT) #else add_loadfile("freetype-font", DEFAULT_FONT_FILE, FONT_TEXT, FONT_LONGTEXT) add_loadfile("freetype-monofont", DEFAULT_MONOSPACE_FONT_FILE,