* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#include <vlc_memory.h>
+
typedef struct font_stack_t font_stack_t;
struct font_stack_t
{
static TR_FONT_STYLE_PTR GetStyleFromFontStack( filter_sys_t *p_sys,
font_stack_t **p_fonts, bool b_bold, bool b_italic,
- bool b_uline );
+ bool b_uline, bool b_through );
static int PushFont( font_stack_t **p_font, const char *psz_name, int i_size,
uint32_t i_color, uint32_t i_karaoke_bg_color )
if( *ppi_k_durations )
{
- *ppi_k_durations = (uint32_t *)
- realloc( *ppi_k_durations,
+ *ppi_k_durations = realloc_or_free( *ppi_k_durations,
*pi_k_runs * sizeof( uint32_t ) );
}
else if( *pi_k_runs == 1 )
if( *ppi_k_run_lengths )
{
- *ppi_k_run_lengths = (uint32_t *)
- realloc( *ppi_k_run_lengths,
+ *ppi_k_run_lengths = realloc_or_free( *ppi_k_run_lengths,
*pi_k_runs * sizeof( uint32_t ) );
}
else if( *pi_k_runs == 1 )
}
/* */
-static void HandleMarkup( char *psz_node )
-{
- static const struct
- {
- const char *psz_pattern;
- char i_char;
- } p_replace[] = {
- { "<", '<' },
- { ">", '>' },
- { "&", '&' },
- { """, '"' },
- /* This one will always match */
- { "&", '&' }
- };
-
- char *s = psz_node;
- while( ( s = strchr( s, '&' ) ) != NULL )
- {
- size_t i_size;
- int i;
- for( i = 0; ; i++ )
- {
- i_size = strlen(p_replace[i].psz_pattern);
- if( !strncmp( s, p_replace[i].psz_pattern, i_size ) )
- break;
- }
- if( i_size > 1 )
- memmove( &s[1], &s[i_size],
- strlen( s ) - i_size + 1 );
- *s++ = p_replace[i].i_char;
- }
-}
-
static int ProcessNodes( filter_t *p_filter,
xml_reader_t *p_xml_reader,
text_style_t *p_font_style,
bool b_italic = false;
bool b_bold = false;
bool b_uline = false;
+ bool b_through = false;
if( VLC_SUCCESS == var_Get( p_filter, "scale", &val ))
i_scale = val.i_int;
b_italic = true;
if( p_font_style->i_style_flags & STYLE_UNDERLINE )
b_uline = true;
+ if( p_font_style->i_style_flags & STYLE_STRIKEOUT )
+ b_through = true;
}
+#ifdef HAVE_FONTCONFIG
else
{
rv = PushFont( &p_fonts,
TR_DEFAULT_FONT,
p_sys->i_font_size,
- TR_DEFAULT_COLOR,
+ (p_sys->i_font_color & 0xffffff) |
+ (((255-p_sys->i_font_opacity) & 0xff) << 24),
0x00ffffff );
}
+#endif
+
if( rv != VLC_SUCCESS )
return rv;
b_italic = false;
else if( !strcasecmp( "u", psz_node ) )
b_uline = false;
+ else if( !strcasecmp( "s", psz_node ) )
+ b_through = false;
free( psz_node );
}
b_italic = true;
else if( !strcasecmp( "u", psz_node ) )
b_uline = true;
+ else if( !strcasecmp( "s", psz_node ) )
+ b_through = true;
+
else if( !strcasecmp( "br", psz_node ) )
{
SetupLine( p_filter, "\n", &psz_text,
&p_fonts,
b_bold,
b_italic,
- b_uline ) );
+ b_uline,
+ b_through) );
}
else if( !strcasecmp( "k", psz_node ) )
{
{
/* */
HandleWhiteSpace( psz_node );
- HandleMarkup( psz_node );
+ resolve_xml_special_chars( psz_node );
SetupLine( p_filter, psz_node, &psz_text,
pi_runs, ppi_run_lengths, ppp_styles,
&p_fonts,
b_bold,
b_italic,
- b_uline ) );
+ b_uline,
+ b_through) );
free( psz_node );
}
break;