freetype: use var_Inherit.

[vlc] / modules / misc / freetype.c

diff --git a/modules/misc/freetype.c b/modules/misc/freetype.c
index 22cb97027c586836f871ee002eec4455898426a7..e39d8afe595944438bc45bd81a4b3531480603ac 100644 (file)
--- 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;
@@ -479,11 +479,11 @@ error:
 #ifdef HAVE_FONTCONFIG
     if( fontmatch ) FcPatternDestroy( fontmatch );
     if( fontpattern ) FcPatternDestroy( fontpattern );
-#endif
 
 #ifdef WIN32
     if( p_dialog )
         dialog_ProgressDestroy( p_dialog );
+#endif
 #endif
 
     if( p_sys->p_face ) FT_Done_Face( p_sys->p_face );
@@ -2236,7 +2236,7 @@ static int RenderHtml( filter_t *p_filter, subpicture_region_t *p_region_out,
             {
                 /* Only text and karaoke tags are supported */
                 msg_Dbg( p_filter, "Unsupported top-level tag '%s' ignored.", psz_node );
-                xml_ReaderDelete( p_xml_reader );
+                p_filter->p_sys->p_xml = xml_ReaderReset( p_xml_reader, NULL );
                 p_xml_reader = NULL;
                 rv = VLC_EGENERIC;
             }
@@ -2297,7 +2297,7 @@ static int RenderHtml( filter_t *p_filter, subpicture_region_t *p_region_out,
                                 result.x, result.y );
             }
         }
-        xml_ReaderReset( p_xml_reader, NULL );
+        p_filter->p_sys->p_xml = xml_ReaderReset( p_xml_reader, NULL );
         FreeLines( p_lines );
     }
     stream_Delete( p_sub );