Changeset 1605af5772bcc37e7969c050de598e5911d9637c

Timestamp:

05/08/07 22:01:21 (1 year ago)

Author:

Jean-Baptiste Kempf <jb@videolan.org>

git-committer:

Jean-Baptiste Kempf <jb@videolan.org> 1186344081 +0000

git-parent:

[62b68c2c4515ec427df9fd104261ab2101cfdecc]

git-author:

Jean-Baptiste Kempf <jb@videolan.org> 1186344081 +0000

Message:

Subsdec: remove trailing spaces.

Files:

• modules/codec/subsdec.c (modified) (22 diffs)

modules/codec/subsdec.c

@@ -657 +657 @@
-    if( i_mask & ATTRIBUTE_ALIGNMENT )
-        p_region->i_align = i_align;
-
+
-    /* TODO: Setup % based offsets properly, without adversely affecting
-     *       everything else in vlc. Will address with separate patch, to
@@ -732 +732 @@
-            p_text_region->i_x         = p_style->i_margin_h;
-            p_text_region->i_y         = p_style->i_margin_v;
-
+
-        }
-        else
@@ -744 +744 @@
-         */
-        SetupPositions( p_text_region, psz_subtitle );
-
+
-        p_text_region->p_next = NULL;
-    }
@@ -767 +767 @@
-            {
-                psz_end = strcasestr( psz_subtitle, "</text>" );
-
+
-                if( psz_end )
-                {
@@ -779 +779 @@
-                                                      psz_end - psz_subtitle,
-                                                      p_sys->i_align );
-
+
-                    if( p_text_region )
-                    {
@@ -806 +806 @@
-            {
-                psz_end = strcasestr( psz_subtitle, "</karaoke>" );
-
+
-                if( psz_end )
-                {
@@ -818 +818 @@
-                                                      psz_end - psz_subtitle,
-                                                      p_sys->i_align );
-
+
-                    if( p_text_region )
-                    {
@@ -846 +846 @@
-                char *psz_content = strchr( psz_subtitle, '>' );
-                int   i_transparent = -1;
-
+
-                /* If a colorkey parameter is specified, then we have to map
-                 * that index in the picture through as transparent (it is
@@ -896 +896 @@
-            if( psz_end )
-                psz_subtitle = psz_end - 1;
-
+
-            psz_subtitle += strcspn( psz_subtitle, ">" );
-        }
@@ -1014 +1014 @@
-            p_spu->i_x = (i_margin_l) ? i_margin_l : p_style->i_margin_h;
-        }
- 
+
-        {
-            p_spu->i_x = (i_margin_r) ? i_margin_r : p_style->i_margin_h;
@@ -1119 +1119 @@
-            {
-                block_t   *p_block;
-
+
-                p_block = block_New( p_image->p_parent, p_attach->i_data );
-
@@ -1169 +1169 @@
-        vlc_input_attachment_Delete( pp_attachments[ k ] );
-    }
-        
+
-
-    return VLC_SUCCESS;
@@ -1231 +1231 @@
-            case XML_READER_ENDELEM:
-                psz_node = xml_ReaderName( p_xml_reader );
-
+
-                if( !psz_node )
-                    break;
@@ -1258 +1258 @@
-                        break;
-                }
-
+
-                free( psz_node );
-                break;
@@ -1305 +1305 @@
-                    }
-                    /* All styles are supposed to default to Default, and then
- 
+
-                     * At the moment this only effects styles defined AFTER
-                     * Default in the XML
@@ -1404 +1404 @@
-                                    p_style->font_style.i_outline_alpha = (col >> 24) & 0xff;
-                                }
- 
+
-                            else if( !strcasecmp( "outline-level", psz_name ) )
-                            {
-                                p_style->font_style.i_outline_width = atoi( psz_value );
- 
+
-                            else if( !strcasecmp( "shadow-color", psz_name ) )
-                            {
@@ -1421 +1421 @@
-                            {
-                                p_style->font_style.i_shadow_width = atoi( psz_value );
- 
+
-                            else if( !strcasecmp( "back-color", psz_name ) )
-                            {
@@ -1434 +1434 @@
-                            {
-                                p_style->font_style.i_spacing = atoi( psz_value );
- 
+
-                        }
-                        if( psz_name )  free( psz_name );
@@ -1501 +1501 @@
-                    }
-                }
-
+
-                free( psz_node );
-                break;
@@ -1597 +1597 @@
-                    if( i_align == 3 || i_align == 7 || i_align == 11 ) p_style->i_align |= SUBPICTURE_ALIGN_RIGHT;
-                    if( i_align < 4 ) p_style->i_align |= SUBPICTURE_ALIGN_BOTTOM;
- 
+
-
-                    p_style->i_margin_h = ( p_style->i_align & SUBPICTURE_ALIGN_RIGHT ) ? i_margin_r : i_margin_l;
@@ -1844 +1844 @@
-                            int i_len = strlen( psz_attribs[ k ] );
-
- 
+
-                            {
-                                i_len += strcspn( psz_subtitle + i_len, "\"" ) + 1;
@@ -2054 +2054 @@
-        return NULL;
-    }
-
+
-    /* Display the feed's image */
-    memset( &fmt_out, 0, sizeof( video_format_t));