}
-static text_style_t *GetStyleFromFontStack( filter_t *p_filter,
- font_stack_t **p_fonts,
- int i_style_flags )
-{
- char *psz_fontname = NULL;
- uint32_t i_font_color = var_InheritInteger( p_filter, "freetype-color" );
- i_font_color = VLC_CLIP( i_font_color, 0, 0xFFFFFF );
- i_font_color = i_font_color & 0x00ffffff;
- int i_font_size = p_filter->p_sys->style.i_font_size;
- uint32_t i_karaoke_bg_color = i_font_color;
-
- if( PeekFont( p_fonts, &psz_fontname, &i_font_size,
- &i_font_color, &i_karaoke_bg_color ) )
- return NULL;
-
- return CreateStyle( psz_fontname, i_font_size, i_font_color,
- i_karaoke_bg_color,
- i_style_flags );
-}
-
static int ProcessNodes( filter_t *p_filter,
uni_char_t *psz_text,
"\n",
GetStyleFromFontStack( p_filter,
&p_fonts,
+ &p_sys->style,
i_style_flags ),
i_k_date );
}
psz_node,
GetStyleFromFontStack( p_filter,
&p_fonts,
+ &p_sys->style,
i_style_flags ),
i_k_date );
free( psz_node );
!strcmp( p_style1->psz_fontname, p_style2->psz_fontname );
}
+text_style_t *GetStyleFromFontStack( filter_t *p_filter,
+ font_stack_t **p_fonts,
+ text_style_t *style,
+ int i_style_flags )
+{
+ char *psz_fontname = NULL;
+ uint32_t i_font_color = var_InheritInteger( p_filter, "freetype-color" );
+ i_font_color = VLC_CLIP( i_font_color, 0, 0xFFFFFF );
+ i_font_color = i_font_color & 0x00ffffff;
+
+ int i_font_size = style->i_font_size;
+ uint32_t i_karaoke_bg_color = i_font_color;
+
+ if( PeekFont( p_fonts, &psz_fontname, &i_font_size,
+ &i_font_color, &i_karaoke_bg_color ) )
+ return NULL;
+
+ return CreateStyle( psz_fontname, i_font_size, i_font_color,
+ i_karaoke_bg_color,
+ i_style_flags );
+}
+
uint32_t i_font_color, uint32_t i_karaoke_bg_color,
int i_style_flags );
+text_style_t *GetStyleFromFontStack( filter_t *p_filter,
+ font_stack_t **p_fonts,
+ text_style_t *style,
+ int i_style_flags );
+
#ifdef __OS2__
typedef uint16_t uni_char_t;
# define FREETYPE_TO_UCS "UCS-2LE"