From 2c443c4c0bd60cf49b8529905c6e6e3330cc864c Mon Sep 17 00:00:00 2001
From: arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 9 Jan 2003 19:25:05 +0000
Subject: 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@katamail.com>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8863 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 subreader.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'subreader.c')

diff --git a/subreader.c b/subreader.c
index 74b97acf1a..b6b241b341 100644
--- a/subreader.c
+++ b/subreader.c
@@ -574,7 +574,7 @@ subtitle *sub_read_line_aqt(FILE *fd,subtitle *current) {
     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 @@ char * sub_filename(char* path,  char * fname )
     ".SSA",
     ".aqt",
     ".AQT",
-    ".js",
-    ".JS" };
+    ".jss",
+    ".JSS" };
 
 
  if ( fname == NULL ) return NULL;
@@ -1356,13 +1356,13 @@ void list_sub_file(subtitle* subs){
 
     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 @@ void dump_jacosub(subtitle* subs, float fps) {
 
     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");
-- 
cgit v1.2.3