[vlc-commits] commit: freetype: use var_Inherit. ( Rémi Duraffort )
git at videolan.org
git at videolan.org
Thu Sep 30 20:40:24 CEST 2010
vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Thu Sep 30 20:39:21 2010 +0200| [cb6f956af387be6dd030caff8527f3238a7e3f54] | committer: Rémi Duraffort
freetype: use var_Inherit.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=cb6f956af387be6dd030caff8527f3238a7e3f54
---
modules/misc/freetype.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/modules/misc/freetype.c b/modules/misc/freetype.c
index 0f68c94..e39d8af 100644
--- a/modules/misc/freetype.c
+++ b/modules/misc/freetype.c
@@ -316,12 +316,12 @@ static int Create( vlc_object_t *p_this )
var_Create( p_filter, "freetype-rel-fontsize",
VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- psz_fontfamily = var_CreateGetString( p_filter, "freetype-font" );
- p_sys->i_default_font_size = var_CreateGetInteger( p_filter, "freetype-fontsize" );
- p_sys->i_effect = var_CreateGetInteger( p_filter, "freetype-effect" );
- p_sys->i_font_opacity = var_CreateGetInteger( p_filter,"freetype-opacity" );
+ psz_fontfamily = var_InheritString( p_filter, "freetype-font" );
+ p_sys->i_default_font_size = var_InheritInteger( p_filter, "freetype-fontsize" );
+ p_sys->i_effect = var_InheritInteger( p_filter, "freetype-effect" );
+ p_sys->i_font_opacity = var_InheritInteger( p_filter,"freetype-opacity" );
p_sys->i_font_opacity = __MAX( __MIN( p_sys->i_font_opacity, 255 ), 0 );
- p_sys->i_font_color = var_CreateGetInteger( p_filter, "freetype-color" );
+ p_sys->i_font_color = var_InheritInteger( p_filter, "freetype-color" );
p_sys->i_font_color = __MAX( __MIN( p_sys->i_font_color , 0xFFFFFF ), 0 );
fontindex=0;
More information about the vlc-commits
mailing list