[Mplayer-cvslog] CVS: main subreader.c,1.88,1.89

[Arpi of Ize]

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

Modified Files:
	subreader.c 
Log Message:
Since version 2.7 the file extension for JACOsub changed from
 '.js' to '.jss', to avoid confusion with javascript.
There is also a new format for list_sub_file output; however
this is used only in debugging subtitles code, while disabled in
real life use.

patch by <salvatore.falco at katamail.com>


Index: subreader.c
===================================================================
RCS file: /cvsroot/mplayer/main/subreader.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- subreader.c	5 Jan 2003 02:46:13 -0000	1.88
+++ subreader.c	9 Jan 2003 19:25:05 -0000	1.89
@@ -574,7 +574,7 @@
     current->end = current->start; // will be corrected by next subtitle
 
     if (!fgets (line, LINE_LEN, fd))
-	return current;;
+	return current;
 
     next = line,i=1;
     while ((next =sub_readtext (next, &(current->text[i])))) {
@@ -1306,8 +1306,8 @@
     ".SSA",
     ".aqt",
     ".AQT",
-    ".js",
-    ".JS" };
+    ".jss",
+    ".JSS" };
 
 
  if ( fname == NULL ) return NULL;
@@ -1356,13 +1356,13 @@
 
     for(j=0;j<sub_num;j++){
 	subtitle* egysub=&subs[j];
-        printf ("%i line%c (%li-%li) ",
+        printf ("%i line%c (%li-%li)\n",
 		    egysub->lines,
 		    (1==egysub->lines)?' ':'s',
 		    egysub->start,
 		    egysub->end);
 	for (i=0; i<egysub->lines; i++) {
-	    printf ("%s%s",egysub->text[i], i==egysub->lines-1?"":" <BREAK> ");
+	    printf ("\t\t%d: %s%s", i,egysub->text[i], i==egysub->lines-1?"":" \n ");
 	}
 	printf ("\n");
     }
@@ -1510,7 +1510,7 @@
 
     if (!sub_uses_time && sub_fps == 0)
 	sub_fps = fps;
-    fd=fopen("dumpsub.js","w");
+    fd=fopen("dumpsub.jss","w");
     if(!fd)
     { 
 	perror("dump_jacosub: fopen");