[MPlayer-dev-eng] [PATCH] fix closed caption display for TiVo/tystreams

[Ivo]

On Wednesday 16 August 2006 16:05, Doug Swarin wrote:
> Nico Sabbi wrote:
> > it's full of cosmetics; repost the patch without them, please
>
> I'm very sorry, but I see no cosmetic changes in the patch except one
> removal of a trailing space from a blank line which crept in around
> line 287 of the patch in ty_drawchar(). Could you please point out
> what other cosmetic changes you refer to? All other changes should be
> completely functional.
>
> Many of the lines are changing ty_OSD1 to ty_OSD2, which may look
> almost identical as if it were a cosmetic change.

Things like he following:

-		memset( ty_OSD1.text[ index ], ' ', TY_CC_MAX_X - 1 );
-		ty_OSD1.text[ index ][ TY_CC_MAX_X - 1 ] = 0;
-		memset( ty_OSD2.text[ index ], ' ', TY_CC_MAX_X - 1 );
-		ty_OSD2.text[ index ][ TY_CC_MAX_X - 1 ] = 0;
+
+		if ( osd == 0 || osd == 1 )
+		{
+			memset( ty_OSD1.text[ index ], ' ', TY_CC_MAX_X - 1 );
+			ty_OSD1.text[ index ][ TY_CC_MAX_X - 1 ] = 0;
+		}
+
+		if ( osd == 0 || osd == 2 )
+		{
+			memset( ty_OSD2.text[ index ], ' ', TY_CC_MAX_X - 1 );
+			ty_OSD2.text[ index ][ TY_CC_MAX_X - 1 ] = 0;
+		}

should be:

+		if ( osd == 0 || osd == 1 ) {
 		memset( ty_OSD1.text[ index ], ' ', TY_CC_MAX_X - 1 );
 		ty_OSD1.text[ index ][ TY_CC_MAX_X - 1 ] = 0;
+		}
+		if ( osd == 0 || osd == 2 ) {
 		memset( ty_OSD2.text[ index ], ' ', TY_CC_MAX_X - 1 );
 		ty_OSD2.text[ index ][ TY_CC_MAX_X - 1 ] = 0;
+		}

et cetera...

After that, one could change the indentation and commit that separately.

--Ivo