Do not print real index debug by default.

[vlc] / modules / misc / text_renderer.h

diff --git a/modules/misc/text_renderer.h b/modules/misc/text_renderer.h
index 5b6e07551e49ffbe9b311b13e830e1ec0382b8b1..d8835b053f579b268875c54a7adca5eafc3278b8 100644 (file)
--- a/modules/misc/text_renderer.h
+++ b/modules/misc/text_renderer.h
@@ -494,39 +494,6 @@ static void HandleWhiteSpace( char *psz_node )
 }
 
 /* */
-static void HandleMarkup( char *psz_node )
-{
-    static const struct
-    {
-        const char *psz_pattern;
-        char i_char;
-    } p_replace[] = {
-        { "&lt;",   '<' },
-        { "&gt;",   '>' },
-        { "&amp;",  '&' },
-        { "&quot;", '"' },
-        /* 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,
@@ -580,7 +547,8 @@ static int ProcessNodes( filter_t *p_filter,
         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 );
     }
     if( rv != VLC_SUCCESS )
@@ -654,7 +622,7 @@ static int ProcessNodes( filter_t *p_filter,
                 {
                     /* */
                     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,