[Mplayer-cvslog] CVS: main subreader.c,1.54,1.55

[Arpi of Ize]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv29448

Modified Files:
	subreader.c 
Log Message:
vplayer sub fix by Arkadiusz Podgorski <wodzu at softomat.com.pl>

Index: subreader.c
===================================================================
RCS file: /cvsroot/mplayer/main/subreader.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- subreader.c	28 Feb 2002 02:37:13 -0000	1.54
+++ subreader.c	27 Mar 2002 01:22:11 -0000	1.55
@@ -265,6 +265,7 @@
 		
 		if (!(current->start = a1*360000+a2*6000+a3*100))
 			continue;
+                /* removed by wodzu
 		p=line;	
  		// finds the body of the subtitle
  		for (i=0; i<3; i++){              
@@ -276,6 +277,11 @@
 		    printf("SUB: Skipping incorrect subtitle line!\n");
 		    continue;
 		}
+                */
+                // by wodzu: hey! this time we know what length it has! what is
+                // that magic for? it can't deal with space instead of third
+                // colon! look, what simple it can be:
+                p = &line[ plen ];
 
  		i=0;
 		if (*p!='|') {
@@ -488,6 +494,8 @@
 	if (strstr (line, "<SAMI>"))
 		{sub_uses_time=1; return SUB_SAMI;}
 	if (sscanf (line, "%d:%d:%d:",     &i, &i, &i )==3)
+		{sub_uses_time=1;return SUB_VPLAYER;}
+	if (sscanf (line, "%d:%d:%d ",     &i, &i, &i )==3)
 		{sub_uses_time=1;return SUB_VPLAYER;}
 	//TODO: just checking if first line of sub starts with "<" is WAY
 	// too weak test for RT