Mercurial > mplayer.hg
annotate subreader.c @ 8141:be9a2636b071
use the more stable NEWTYPE critsect code
author | arpi |
---|---|
date | Sun, 10 Nov 2002 21:04:10 +0000 |
parents | 9fc45fe0d444 |
children | 72647ce8471f |
rev | line source |
---|---|
258 | 1 /* |
2 * Subtitle reader with format autodetection | |
3 * | |
4 * Written by laaz | |
5 * Some code cleanup & realloc() by A'rpi/ESP-team | |
1081 | 6 * dunnowhat sub format by szabi |
258 | 7 */ |
8 | |
9 | |
10 #include <stdio.h> | |
11 #include <stdlib.h> | |
12 #include <string.h> | |
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
13 #include <ctype.h> |
258 | 14 |
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
15 #include "config.h" |
6296 | 16 #include "mp_msg.h" |
258 | 17 #include "subreader.h" |
18 | |
3701 | 19 #define ERR ((void *) -1) |
258 | 20 |
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
21 #ifdef USE_ICONV |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
22 #include <iconv.h> |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
23 char *sub_cp=NULL; |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
24 #endif |
258 | 25 |
2912 | 26 /* Maximal length of line of a subtitle */ |
27 #define LINE_LEN 1000 | |
2177 | 28 |
2178 | 29 static float mpsub_position=0; |
2177 | 30 |
258 | 31 int sub_uses_time=0; |
32 int sub_errs=0; | |
624 | 33 int sub_num=0; // number of subtitle structs |
3235
0cf593b6bab0
patch fixes the showing last line of subtitles and support of SAMI Slacktime option by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
2915
diff
changeset
|
34 int sub_slacktime=2000; // 20 seconds |
2912 | 35 |
36 /* Use the SUB_* constant defined in the header file */ | |
37 int sub_format=SUB_INVALID; | |
624 | 38 |
3701 | 39 static int eol(char p) { |
624 | 40 return (p=='\r' || p=='\n' || p=='\0'); |
41 } | |
42 | |
3701 | 43 /* Remove leading and trailing space */ |
44 static void trail_space(char *s) { | |
45 int i = 0; | |
3924
9f18722fafe9
tail_space infinite loop fix by jeon_goon@lycos.co.kr
arpi
parents:
3735
diff
changeset
|
46 while (isspace(s[i])) ++i; |
3701 | 47 if (i) strcpy(s, s + i); |
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
48 i = strlen(s) - 1; |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
49 while (i > 0 && isspace(s[i])) s[i--] = '\0'; |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
50 } |
624 | 51 |
2343 | 52 |
624 | 53 subtitle *sub_read_line_sami(FILE *fd, subtitle *current) { |
2912 | 54 static char line[LINE_LEN+1]; |
3235
0cf593b6bab0
patch fixes the showing last line of subtitles and support of SAMI Slacktime option by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
2915
diff
changeset
|
55 static char *s = NULL, *slacktime_s; |
7472
c4434bdf6e51
tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
arpi
parents:
7460
diff
changeset
|
56 char text[LINE_LEN+1], *p=NULL, *q; |
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
57 int state; |
624 | 58 |
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
59 current->lines = current->start = current->end = 0; |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
60 state = 0; |
624 | 61 |
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
62 /* read the first line */ |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
63 if (!s) |
2912 | 64 if (!(s = fgets(line, LINE_LEN, fd))) return 0; |
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
65 |
624 | 66 do { |
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
67 switch (state) { |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
68 |
3235
0cf593b6bab0
patch fixes the showing last line of subtitles and support of SAMI Slacktime option by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
2915
diff
changeset
|
69 case 0: /* find "START=" or "Slacktime:" */ |
0cf593b6bab0
patch fixes the showing last line of subtitles and support of SAMI Slacktime option by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
2915
diff
changeset
|
70 slacktime_s = strstr (s, "Slacktime:"); |
0cf593b6bab0
patch fixes the showing last line of subtitles and support of SAMI Slacktime option by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
2915
diff
changeset
|
71 if (slacktime_s) sub_slacktime = strtol (slacktime_s + 10, NULL, 0) / 10; |
0cf593b6bab0
patch fixes the showing last line of subtitles and support of SAMI Slacktime option by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
2915
diff
changeset
|
72 |
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
73 s = strstr (s, "Start="); |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
74 if (s) { |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
75 current->start = strtol (s + 6, &s, 0) / 10; |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
76 state = 1; continue; |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
77 } |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
78 break; |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
79 |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
80 case 1: /* find "<P" */ |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
81 if ((s = strstr (s, "<P"))) { s += 2; state = 2; continue; } |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
82 break; |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
83 |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
84 case 2: /* find ">" */ |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
85 if ((s = strchr (s, '>'))) { s++; state = 3; p = text; continue; } |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
86 break; |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
87 |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
88 case 3: /* get all text until '<' appears */ |
3235
0cf593b6bab0
patch fixes the showing last line of subtitles and support of SAMI Slacktime option by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
2915
diff
changeset
|
89 if (*s == '\0') break; |
2836
ec672ea5ac2c
Applied SAMI patch by Evgeny Chukreev <codedj at echo dot ru>
atmos4
parents:
2495
diff
changeset
|
90 else if (!strncasecmp (s, "<br>", 4)) { |
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
91 *p = '\0'; p = text; trail_space (text); |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
92 if (text[0] != '\0') |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
93 current->text[current->lines++] = strdup (text); |
2836
ec672ea5ac2c
Applied SAMI patch by Evgeny Chukreev <codedj at echo dot ru>
atmos4
parents:
2495
diff
changeset
|
94 s += 4; |
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
95 } |
2836
ec672ea5ac2c
Applied SAMI patch by Evgeny Chukreev <codedj at echo dot ru>
atmos4
parents:
2495
diff
changeset
|
96 else if (*s == '<') { state = 4; } |
ec672ea5ac2c
Applied SAMI patch by Evgeny Chukreev <codedj at echo dot ru>
atmos4
parents:
2495
diff
changeset
|
97 else if (!strncasecmp (s, " ", 6)) { *p++ = ' '; s += 6; } |
ec672ea5ac2c
Applied SAMI patch by Evgeny Chukreev <codedj at echo dot ru>
atmos4
parents:
2495
diff
changeset
|
98 else if (*s == '\t') { *p++ = ' '; s++; } |
ec672ea5ac2c
Applied SAMI patch by Evgeny Chukreev <codedj at echo dot ru>
atmos4
parents:
2495
diff
changeset
|
99 else if (*s == '\r' || *s == '\n') { s++; } |
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
100 else *p++ = *s++; |
2836
ec672ea5ac2c
Applied SAMI patch by Evgeny Chukreev <codedj at echo dot ru>
atmos4
parents:
2495
diff
changeset
|
101 |
ec672ea5ac2c
Applied SAMI patch by Evgeny Chukreev <codedj at echo dot ru>
atmos4
parents:
2495
diff
changeset
|
102 /* skip duplicated space */ |
ec672ea5ac2c
Applied SAMI patch by Evgeny Chukreev <codedj at echo dot ru>
atmos4
parents:
2495
diff
changeset
|
103 if (p > text + 2) if (*(p-1) == ' ' && *(p-2) == ' ') p--; |
ec672ea5ac2c
Applied SAMI patch by Evgeny Chukreev <codedj at echo dot ru>
atmos4
parents:
2495
diff
changeset
|
104 |
624 | 105 continue; |
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
106 |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
107 case 4: /* get current->end or skip <TAG> */ |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
108 q = strstr (s, "Start="); |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
109 if (q) { |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
110 current->end = strtol (q + 6, &q, 0) / 10 - 1; |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
111 *p = '\0'; trail_space (text); |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
112 if (text[0] != '\0') |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
113 current->text[current->lines++] = strdup (text); |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
114 if (current->lines > 0) { state = 99; break; } |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
115 state = 0; continue; |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
116 } |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
117 s = strchr (s, '>'); |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
118 if (s) { s++; state = 3; continue; } |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
119 break; |
624 | 120 } |
121 | |
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
122 /* read next line */ |
3735 | 123 if (state != 99 && !(s = fgets (line, LINE_LEN, fd))) { |
124 if (current->start > 0) { | |
125 break; // if it is the last subtitle | |
126 } else { | |
127 return 0; | |
128 } | |
129 } | |
3235
0cf593b6bab0
patch fixes the showing last line of subtitles and support of SAMI Slacktime option by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
2915
diff
changeset
|
130 |
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
131 } while (state != 99); |
624 | 132 |
3235
0cf593b6bab0
patch fixes the showing last line of subtitles and support of SAMI Slacktime option by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
2915
diff
changeset
|
133 // For the last subtitle |
0cf593b6bab0
patch fixes the showing last line of subtitles and support of SAMI Slacktime option by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
2915
diff
changeset
|
134 if (current->end <= 0) { |
0cf593b6bab0
patch fixes the showing last line of subtitles and support of SAMI Slacktime option by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
2915
diff
changeset
|
135 current->end = current->start + sub_slacktime; |
0cf593b6bab0
patch fixes the showing last line of subtitles and support of SAMI Slacktime option by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
2915
diff
changeset
|
136 *p = '\0'; trail_space (text); |
0cf593b6bab0
patch fixes the showing last line of subtitles and support of SAMI Slacktime option by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
2915
diff
changeset
|
137 if (text[0] != '\0') |
0cf593b6bab0
patch fixes the showing last line of subtitles and support of SAMI Slacktime option by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
2915
diff
changeset
|
138 current->text[current->lines++] = strdup (text); |
0cf593b6bab0
patch fixes the showing last line of subtitles and support of SAMI Slacktime option by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
2915
diff
changeset
|
139 } |
0cf593b6bab0
patch fixes the showing last line of subtitles and support of SAMI Slacktime option by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
2915
diff
changeset
|
140 |
624 | 141 return current; |
142 } | |
258 | 143 |
144 | |
145 char *sub_readtext(char *source, char **dest) { | |
146 int len=0; | |
932 | 147 char *p=source; |
258 | 148 |
6242
9c8c3b5e6658
possible sig11 fixed in .rt parser (weisskreuzova.zip)
arpi
parents:
6208
diff
changeset
|
149 // printf("src=%p dest=%p \n",source,dest); |
9c8c3b5e6658
possible sig11 fixed in .rt parser (weisskreuzova.zip)
arpi
parents:
6208
diff
changeset
|
150 |
932 | 151 while ( !eol(*p) && *p!= '|' ) { |
152 p++,len++; | |
153 } | |
258 | 154 |
155 *dest= (char *)malloc (len+1); | |
156 if (!dest) {return ERR;} | |
157 | |
158 strncpy(*dest, source, len); | |
159 (*dest)[len]=0; | |
160 | |
161 while (*p=='\r' || *p=='\n' || *p=='|') p++; | |
162 | |
163 if (*p) return p; // not-last text field | |
164 else return NULL; // last text field | |
165 } | |
166 | |
167 subtitle *sub_read_line_microdvd(FILE *fd,subtitle *current) { | |
2912 | 168 char line[LINE_LEN+1]; |
169 char line2[LINE_LEN+1]; | |
258 | 170 char *p, *next; |
171 int i; | |
172 | |
173 do { | |
2912 | 174 if (!fgets (line, LINE_LEN, fd)) return NULL; |
4048
654419a9a228
changed subreader.c to read microdvd lines in form "{%ld}{}[^\r\n]" too
atlka
parents:
3924
diff
changeset
|
175 } while ((sscanf (line, |
654419a9a228
changed subreader.c to read microdvd lines in form "{%ld}{}[^\r\n]" too
atlka
parents:
3924
diff
changeset
|
176 "{%ld}{}%[^\r\n]", |
654419a9a228
changed subreader.c to read microdvd lines in form "{%ld}{}[^\r\n]" too
atlka
parents:
3924
diff
changeset
|
177 &(current->start), line2) < 2) && |
654419a9a228
changed subreader.c to read microdvd lines in form "{%ld}{}[^\r\n]" too
atlka
parents:
3924
diff
changeset
|
178 (sscanf (line, |
654419a9a228
changed subreader.c to read microdvd lines in form "{%ld}{}[^\r\n]" too
atlka
parents:
3924
diff
changeset
|
179 "{%ld}{%ld}%[^\r\n]", |
654419a9a228
changed subreader.c to read microdvd lines in form "{%ld}{}[^\r\n]" too
atlka
parents:
3924
diff
changeset
|
180 &(current->start), &(current->end), line2) < 3)); |
654419a9a228
changed subreader.c to read microdvd lines in form "{%ld}{}[^\r\n]" too
atlka
parents:
3924
diff
changeset
|
181 |
932 | 182 p=line2; |
258 | 183 |
184 next=p, i=0; | |
1081 | 185 while ((next =sub_readtext (next, &(current->text[i])))) { |
270 | 186 if (current->text[i]==ERR) {return ERR;} |
258 | 187 i++; |
6296 | 188 if (i>=SUB_MAX_TEXT) { mp_msg(MSGT_SUBREADER,MSGL_WARN,"Too many lines in a subtitle\n");current->lines=i;return current;} |
258 | 189 } |
932 | 190 current->lines= ++i; |
258 | 191 |
192 return current; | |
193 } | |
194 | |
195 subtitle *sub_read_line_subrip(FILE *fd, subtitle *current) { | |
2912 | 196 char line[LINE_LEN+1]; |
258 | 197 int a1,a2,a3,a4,b1,b2,b3,b4; |
198 char *p=NULL, *q=NULL; | |
199 int len; | |
200 | |
1764 | 201 while (1) { |
2912 | 202 if (!fgets (line, LINE_LEN, fd)) return NULL; |
269 | 203 if (sscanf (line, "%d:%d:%d.%d,%d:%d:%d.%d",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4) < 8) continue; |
258 | 204 current->start = a1*360000+a2*6000+a3*100+a4; |
205 current->end = b1*360000+b2*6000+b3*100+b4; | |
206 | |
2912 | 207 if (!fgets (line, LINE_LEN, fd)) return NULL; |
258 | 208 |
209 p=q=line; | |
210 for (current->lines=1; current->lines < SUB_MAX_TEXT; current->lines++) { | |
6657
766b6fb28ebf
subrip sometimes uses pipe as newline separator - patch by MOLNAR Andor <dolphy@inf.elte.hu>
arpi
parents:
6597
diff
changeset
|
211 for (q=p,len=0; *p && *p!='\r' && *p!='\n' && *p!='|' && strncmp(p,"[br]",4); p++,len++); |
258 | 212 current->text[current->lines-1]=(char *)malloc (len+1); |
213 if (!current->text[current->lines-1]) return ERR; | |
214 strncpy (current->text[current->lines-1], q, len); | |
270 | 215 current->text[current->lines-1][len]='\0'; |
258 | 216 if (!*p || *p=='\r' || *p=='\n') break; |
6657
766b6fb28ebf
subrip sometimes uses pipe as newline separator - patch by MOLNAR Andor <dolphy@inf.elte.hu>
arpi
parents:
6597
diff
changeset
|
217 if (*p=='|') p++; |
766b6fb28ebf
subrip sometimes uses pipe as newline separator - patch by MOLNAR Andor <dolphy@inf.elte.hu>
arpi
parents:
6597
diff
changeset
|
218 else while (*p++!=']'); |
258 | 219 } |
1764 | 220 break; |
258 | 221 } |
222 return current; | |
223 } | |
224 | |
2912 | 225 subtitle *sub_read_line_subviewer(FILE *fd,subtitle *current) { |
226 char line[LINE_LEN+1]; | |
258 | 227 int a1,a2,a3,a4,b1,b2,b3,b4; |
228 char *p=NULL; | |
229 int i,len; | |
230 | |
231 while (!current->text[0]) { | |
2912 | 232 if (!fgets (line, LINE_LEN, fd)) return NULL; |
269 | 233 if ((len=sscanf (line, "%d:%d:%d,%d --> %d:%d:%d,%d",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4)) < 8) |
258 | 234 continue; |
235 current->start = a1*360000+a2*6000+a3*100+a4/10; | |
236 current->end = b1*360000+b2*6000+b3*100+b4/10; | |
237 for (i=0; i<SUB_MAX_TEXT;) { | |
2912 | 238 if (!fgets (line, LINE_LEN, fd)) break; |
258 | 239 len=0; |
240 for (p=line; *p!='\n' && *p!='\r' && *p; p++,len++); | |
241 if (len) { | |
7608
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
242 int j=0,skip=0; |
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
243 char *curptr=current->text[i]=(char *)malloc (len+1); |
258 | 244 if (!current->text[i]) return ERR; |
7608
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
245 //strncpy (current->text[i], line, len); current->text[i][len]='\0'; |
8123
9fc45fe0d444
*HUGE* set of compiler warning fixes, unused variables removal
arpi
parents:
7983
diff
changeset
|
246 for(; j<len; j++) { |
7608
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
247 /* let's filter html tags ::atmos */ |
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
248 if(line[j]=='>') { |
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
249 skip=0; |
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
250 continue; |
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
251 } |
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
252 if(line[j]=='<') { |
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
253 skip=1; |
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
254 continue; |
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
255 } |
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
256 if(skip) { |
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
257 continue; |
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
258 } |
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
259 *curptr=line[j]; |
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
260 curptr++; |
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
261 } |
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
262 *curptr='\0'; |
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
263 |
258 | 264 i++; |
265 } else { | |
266 break; | |
267 } | |
268 } | |
269 current->lines=i; | |
270 } | |
271 return current; | |
272 } | |
273 | |
6012 | 274 subtitle *sub_read_line_subviewer2(FILE *fd,subtitle *current) { |
275 char line[LINE_LEN+1]; | |
276 int a1,a2,a3,a4; | |
277 char *p=NULL; | |
278 int i,len; | |
279 | |
280 while (!current->text[0]) { | |
281 if (!fgets (line, LINE_LEN, fd)) return NULL; | |
282 if (line[0]!='{') | |
283 continue; | |
284 if ((len=sscanf (line, "{T %d:%d:%d:%d",&a1,&a2,&a3,&a4)) < 4) | |
285 continue; | |
286 current->start = a1*360000+a2*6000+a3*100+a4/10; | |
287 for (i=0; i<SUB_MAX_TEXT;) { | |
288 if (!fgets (line, LINE_LEN, fd)) break; | |
289 if (line[0]=='}') break; | |
290 len=0; | |
291 for (p=line; *p!='\n' && *p!='\r' && *p; ++p,++len); | |
292 if (len) { | |
293 current->text[i]=(char *)malloc (len+1); | |
294 if (!current->text[i]) return ERR; | |
295 strncpy (current->text[i], line, len); current->text[i][len]='\0'; | |
296 ++i; | |
297 } else { | |
298 break; | |
299 } | |
300 } | |
301 current->lines=i; | |
302 } | |
303 return current; | |
304 } | |
305 | |
306 | |
818 | 307 subtitle *sub_read_line_vplayer(FILE *fd,subtitle *current) { |
2912 | 308 char line[LINE_LEN+1]; |
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
309 int a1,a2,a3; |
3735 | 310 char *p=NULL, *next,separator; |
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
311 int i,len,plen; |
818 | 312 |
313 while (!current->text[0]) { | |
2912 | 314 if (!fgets (line, LINE_LEN, fd)) return NULL; |
3724
a2325883c46c
vplayer format - no longer crashes on slightly broken subs.
eyck
parents:
3701
diff
changeset
|
315 if ((len=sscanf (line, "%d:%d:%d%c%n",&a1,&a2,&a3,&separator,&plen)) < 4) |
818 | 316 continue; |
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
317 |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
318 if (!(current->start = a1*360000+a2*6000+a3*100)) |
818 | 319 continue; |
5363
1f068f4bb6e7
vplayer sub fix by Arkadiusz Podgorski <wodzu@softomat.com.pl>
arpi
parents:
4886
diff
changeset
|
320 /* removed by wodzu |
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
321 p=line; |
1640
cbedcfab877b
Fixup to vplayer subtitle submitted to sourceforge by Igor Wojnicki
eyck
parents:
1501
diff
changeset
|
322 // finds the body of the subtitle |
cbedcfab877b
Fixup to vplayer subtitle submitted to sourceforge by Igor Wojnicki
eyck
parents:
1501
diff
changeset
|
323 for (i=0; i<3; i++){ |
3433 | 324 p=strchr(p,':'); |
325 if (p==NULL) break; | |
326 ++p; | |
327 } | |
328 if (p==NULL) { | |
329 printf("SUB: Skipping incorrect subtitle line!\n"); | |
330 continue; | |
331 } | |
5363
1f068f4bb6e7
vplayer sub fix by Arkadiusz Podgorski <wodzu@softomat.com.pl>
arpi
parents:
4886
diff
changeset
|
332 */ |
1f068f4bb6e7
vplayer sub fix by Arkadiusz Podgorski <wodzu@softomat.com.pl>
arpi
parents:
4886
diff
changeset
|
333 // by wodzu: hey! this time we know what length it has! what is |
1f068f4bb6e7
vplayer sub fix by Arkadiusz Podgorski <wodzu@softomat.com.pl>
arpi
parents:
4886
diff
changeset
|
334 // that magic for? it can't deal with space instead of third |
1f068f4bb6e7
vplayer sub fix by Arkadiusz Podgorski <wodzu@softomat.com.pl>
arpi
parents:
4886
diff
changeset
|
335 // colon! look, what simple it can be: |
1f068f4bb6e7
vplayer sub fix by Arkadiusz Podgorski <wodzu@softomat.com.pl>
arpi
parents:
4886
diff
changeset
|
336 p = &line[ plen ]; |
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
337 |
1640
cbedcfab877b
Fixup to vplayer subtitle submitted to sourceforge by Igor Wojnicki
eyck
parents:
1501
diff
changeset
|
338 i=0; |
818 | 339 if (*p!='|') { |
340 // | |
341 next = p,i=0; | |
342 while ((next =sub_readtext (next, &(current->text[i])))) { | |
343 if (current->text[i]==ERR) {return ERR;} | |
344 i++; | |
6296 | 345 if (i>=SUB_MAX_TEXT) { mp_msg(MSGT_SUBREADER,MSGL_WARN,"Too many lines in a subtitle\n");current->lines=i;return current;} |
818 | 346 } |
347 current->lines=i+1; | |
348 } | |
349 } | |
350 return current; | |
351 } | |
352 | |
850 | 353 subtitle *sub_read_line_rt(FILE *fd,subtitle *current) { |
354 //TODO: This format uses quite rich (sub/super)set of xhtml | |
355 // I couldn't check it since DTD is not included. | |
356 // WARNING: full XML parses can be required for proper parsing | |
2912 | 357 char line[LINE_LEN+1]; |
850 | 358 int a1,a2,a3,a4,b1,b2,b3,b4; |
359 char *p=NULL,*next=NULL; | |
360 int i,len,plen; | |
361 | |
362 while (!current->text[0]) { | |
2912 | 363 if (!fgets (line, LINE_LEN, fd)) return NULL; |
850 | 364 //TODO: it seems that format of time is not easily determined, it may be 1:12, 1:12.0 or 0:1:12.0 |
365 //to describe the same moment in time. Maybe there are even more formats in use. | |
366 //if ((len=sscanf (line, "<Time Begin=\"%d:%d:%d.%d\" End=\"%d:%d:%d.%d\"",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4)) < 8) | |
367 plen=a1=a2=a3=a4=b1=b2=b3=b4=0; | |
368 if ( | |
369 ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d\" %*[Ee]nd=\"%d:%d\"%*[^<]<clear/>%n",&a2,&a3,&b2,&b3,&plen)) < 4) && | |
370 ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d\" %*[Ee]nd=\"%d:%d.%d\"%*[^<]<clear/>%n",&a2,&a3,&b2,&b3,&b4,&plen)) < 5) && | |
371 // ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d.%d\" %*[Ee]nd=\"%d:%d\"%*[^<]<clear/>%n",&a2,&a3,&a4,&b2,&b3,&plen)) < 5) && | |
372 ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d.%d\" %*[Ee]nd=\"%d:%d.%d\"%*[^<]<clear/>%n",&a2,&a3,&a4,&b2,&b3,&b4,&plen)) < 6) && | |
373 ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d:%d.%d\" %*[Ee]nd=\"%d:%d:%d.%d\"%*[^<]<clear/>%n",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4,&plen)) < 8) | |
374 ) | |
375 continue; | |
376 current->start = a1*360000+a2*6000+a3*100+a4/10; | |
377 current->end = b1*360000+b2*6000+b3*100+b4/10; | |
378 p=line; p+=plen;i=0; | |
379 // TODO: I don't know what kind of convention is here for marking multiline subs, maybe <br/> like in xml? | |
6242
9c8c3b5e6658
possible sig11 fixed in .rt parser (weisskreuzova.zip)
arpi
parents:
6208
diff
changeset
|
380 next = strstr(line,"<clear/>"); |
9c8c3b5e6658
possible sig11 fixed in .rt parser (weisskreuzova.zip)
arpi
parents:
6208
diff
changeset
|
381 if(next && strlen(next)>8){ |
9c8c3b5e6658
possible sig11 fixed in .rt parser (weisskreuzova.zip)
arpi
parents:
6208
diff
changeset
|
382 next+=8;i=0; |
9c8c3b5e6658
possible sig11 fixed in .rt parser (weisskreuzova.zip)
arpi
parents:
6208
diff
changeset
|
383 while ((next =sub_readtext (next, &(current->text[i])))) { |
850 | 384 if (current->text[i]==ERR) {return ERR;} |
385 i++; | |
6296 | 386 if (i>=SUB_MAX_TEXT) { mp_msg(MSGT_SUBREADER,MSGL_WARN,"Too many lines in a subtitle\n");current->lines=i;return current;} |
6242
9c8c3b5e6658
possible sig11 fixed in .rt parser (weisskreuzova.zip)
arpi
parents:
6208
diff
changeset
|
387 } |
850 | 388 } |
389 current->lines=i+1; | |
390 } | |
391 return current; | |
392 } | |
393 | |
921 | 394 subtitle *sub_read_line_ssa(FILE *fd,subtitle *current) { |
6597 | 395 /* |
396 * Sub Station Alpha v4 (and v2?) scripts have 9 commas before subtitle | |
397 * other Sub Station Alpha scripts have only 8 commas before subtitle | |
398 * Reading the "ScriptType:" field is not reliable since many scripts appear | |
399 * w/o it | |
400 * | |
401 * http://www.scriptclub.org is a good place to find more examples | |
402 * http://www.eswat.demon.co.uk is where the SSA specs can be found | |
403 */ | |
404 int comma; | |
405 static int max_comma = 32; /* let's use 32 for the case that the */ | |
406 /* amount of commas increase with newer SSA versions */ | |
407 | |
921 | 408 int hour1, min1, sec1, hunsec1, |
409 hour2, min2, sec2, hunsec2, nothing; | |
2141 | 410 int num; |
921 | 411 |
2912 | 412 char line[LINE_LEN+1], |
413 line3[LINE_LEN+1], | |
2140 | 414 *line2; |
2141 | 415 char *tmp; |
416 | |
921 | 417 do { |
2912 | 418 if (!fgets (line, LINE_LEN, fd)) return NULL; |
921 | 419 } while (sscanf (line, "Dialogue: Marked=%d,%d:%d:%d.%d,%d:%d:%d.%d," |
2140 | 420 "%[^\n\r]", ¬hing, |
421 &hour1, &min1, &sec1, &hunsec1, | |
422 &hour2, &min2, &sec2, &hunsec2, | |
423 line3) < 9); | |
6597 | 424 |
425 line2=strchr(line3, ','); | |
426 | |
427 for (comma = 4; comma < max_comma; comma ++) | |
428 { | |
429 tmp = line2; | |
430 if(!(tmp=strchr(++tmp, ','))) break; | |
431 if(*(++tmp) == ' ') break; | |
432 /* a space after a comma means we're already in a sentence */ | |
433 line2 = tmp; | |
434 } | |
435 | |
436 if(comma < max_comma)max_comma = comma; | |
2140 | 437 |
6247
0b8660d79efe
sub_read_line_ssa sig11 fix by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
arpi
parents:
6242
diff
changeset
|
438 current->lines=0;num=0; |
921 | 439 current->start = 360000*hour1 + 6000*min1 + 100*sec1 + hunsec1; |
440 current->end = 360000*hour2 + 6000*min2 + 100*sec2 + hunsec2; | |
2141 | 441 |
5990
e5b3385775b3
accept \N too, patch by Reinder <r.cuperus@student.utwente.nl>
arpi
parents:
5828
diff
changeset
|
442 while (((tmp=strstr(line2, "\\n")) != NULL) || ((tmp=strstr(line2, "\\N")) != NULL) ){ |
2141 | 443 current->text[num]=(char *)malloc(tmp-line2+1); |
444 strncpy (current->text[num], line2, tmp-line2); | |
445 current->text[num][tmp-line2]='\0'; | |
446 line2=tmp+2; | |
447 num++; | |
448 current->lines++; | |
449 if (current->lines >= SUB_MAX_TEXT) return current; | |
450 } | |
451 | |
3701 | 452 current->text[num]=strdup(line2); |
6247
0b8660d79efe
sub_read_line_ssa sig11 fix by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
arpi
parents:
6242
diff
changeset
|
453 current->lines++; |
818 | 454 |
921 | 455 return current; |
456 } | |
258 | 457 |
1081 | 458 subtitle *sub_read_line_dunnowhat(FILE *fd,subtitle *current) { |
2912 | 459 char line[LINE_LEN+1]; |
460 char text[LINE_LEN+1]; | |
1081 | 461 |
2912 | 462 if (!fgets (line, LINE_LEN, fd)) |
1081 | 463 return NULL; |
464 if (sscanf (line, "%ld,%ld,\"%[^\"]", &(current->start), | |
465 &(current->end), text) <3) | |
466 return ERR; | |
467 current->text[0] = strdup(text); | |
468 current->lines = 1; | |
469 | |
470 return current; | |
471 } | |
472 | |
2177 | 473 subtitle *sub_read_line_mpsub(FILE *fd, subtitle *current) { |
2912 | 474 char line[LINE_LEN+1]; |
2178 | 475 float a,b; |
476 int num=0; | |
2177 | 477 char *p, *q; |
478 | |
479 do | |
480 { | |
2912 | 481 if (!fgets(line, LINE_LEN, fd)) return NULL; |
2178 | 482 } while (sscanf (line, "%f %f", &a, &b) !=2); |
2177 | 483 |
5828
880008901169
frame-based mpsub parser fix - patch by Rizsanyi Zsolt <rizsanyi@myrealbox.com>
arpi
parents:
5363
diff
changeset
|
484 mpsub_position += a*(sub_uses_time ? 100.0 : 1.0); |
2178 | 485 current->start=(int) mpsub_position; |
5828
880008901169
frame-based mpsub parser fix - patch by Rizsanyi Zsolt <rizsanyi@myrealbox.com>
arpi
parents:
5363
diff
changeset
|
486 mpsub_position += b*(sub_uses_time ? 100.0 : 1.0); |
2178 | 487 current->end=(int) mpsub_position; |
2177 | 488 |
489 while (num < SUB_MAX_TEXT) { | |
4098 | 490 if (!fgets (line, LINE_LEN, fd)) { |
491 if (num == 0) return NULL; | |
492 else return current; | |
493 } | |
2177 | 494 p=line; |
495 while (isspace(*p)) p++; | |
496 if (eol(*p) && num > 0) return current; | |
497 if (eol(*p)) return NULL; | |
498 | |
499 for (q=p; !eol(*q); q++); | |
500 *q='\0'; | |
501 if (strlen(p)) { | |
502 current->text[num]=strdup(p); | |
4098 | 503 // printf (">%s<\n",p); |
2177 | 504 current->lines = ++num; |
505 } else { | |
506 if (num) return current; | |
507 else return NULL; | |
508 } | |
509 } | |
3735 | 510 return NULL; // we should have returned before if it's OK |
2177 | 511 } |
512 | |
2343 | 513 subtitle *previous_aqt_sub = NULL; |
514 | |
515 subtitle *sub_read_line_aqt(FILE *fd,subtitle *current) { | |
2912 | 516 char line[LINE_LEN+1]; |
6076
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
517 char *next; |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
518 int i; |
2343 | 519 |
520 while (1) { | |
521 // try to locate next subtitle | |
2912 | 522 if (!fgets (line, LINE_LEN, fd)) |
2343 | 523 return NULL; |
524 if (!(sscanf (line, "-->> %ld", &(current->start)) <1)) | |
525 break; | |
526 } | |
527 | |
528 if (previous_aqt_sub != NULL) | |
529 previous_aqt_sub->end = current->start-1; | |
530 | |
531 previous_aqt_sub = current; | |
532 | |
2912 | 533 if (!fgets (line, LINE_LEN, fd)) |
2343 | 534 return NULL; |
535 | |
2468 | 536 sub_readtext((char *) &line,¤t->text[0]); |
2343 | 537 current->lines = 1; |
538 current->end = current->start; // will be corrected by next subtitle | |
539 | |
2912 | 540 if (!fgets (line, LINE_LEN, fd)) |
2343 | 541 return current;; |
542 | |
6076
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
543 next = line,i=1; |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
544 while ((next =sub_readtext (next, &(current->text[i])))) { |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
545 if (current->text[i]==ERR) {return ERR;} |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
546 i++; |
6296 | 547 if (i>=SUB_MAX_TEXT) { mp_msg(MSGT_SUBREADER,MSGL_WARN,"Too many lines in a subtitle\n");current->lines=i;return current;} |
6076
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
548 } |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
549 current->lines=i+1; |
2343 | 550 |
551 if ((current->text[0]=="") && (current->text[1]=="")) { | |
552 // void subtitle -> end of previous marked and exit | |
553 previous_aqt_sub = NULL; | |
554 return NULL; | |
555 } | |
556 | |
557 return current; | |
558 } | |
2177 | 559 |
6076
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
560 subtitle *previous_subrip09_sub = NULL; |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
561 |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
562 subtitle *sub_read_line_subrip09(FILE *fd,subtitle *current) { |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
563 char line[LINE_LEN+1]; |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
564 int a1,a2,a3; |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
565 char * next=NULL; |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
566 int i,len; |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
567 |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
568 while (1) { |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
569 // try to locate next subtitle |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
570 if (!fgets (line, LINE_LEN, fd)) |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
571 return NULL; |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
572 if (!((len=sscanf (line, "[%d:%d:%d]",&a1,&a2,&a3)) < 3)) |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
573 break; |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
574 } |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
575 |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
576 if (previous_subrip09_sub != NULL) |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
577 previous_subrip09_sub->end = current->start-1; |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
578 |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
579 previous_subrip09_sub = current; |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
580 |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
581 if (!fgets (line, LINE_LEN, fd)) |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
582 return NULL; |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
583 |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
584 current->start = a1*360000+a2*6000+a3*100; |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
585 |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
586 next = line,i=0; |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
587 |
7472
c4434bdf6e51
tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
arpi
parents:
7460
diff
changeset
|
588 current->text[0]=""; // just to be sure that string is clear |
6076
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
589 |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
590 while ((next =sub_readtext (next, &(current->text[i])))) { |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
591 if (current->text[i]==ERR) {return ERR;} |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
592 i++; |
6296 | 593 if (i>=SUB_MAX_TEXT) { mp_msg(MSGT_SUBREADER,MSGL_WARN,"Too many lines in a subtitle\n");current->lines=i;return current;} |
6076
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
594 } |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
595 current->lines=i+1; |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
596 |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
597 if ((current->text[0]=="") && (i==0)) { |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
598 // void subtitle -> end of previous marked and exit |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
599 previous_subrip09_sub = NULL; |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
600 return NULL; |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
601 } |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
602 |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
603 return current; |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
604 } |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
605 |
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
606 subtitle *sub_read_line_jacosub(FILE * fd, subtitle * current) |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
607 { |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
608 char commands[LINE_LEN], line1[LINE_LEN], line2[LINE_LEN], |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
609 text[LINE_LEN], *p, *q; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
610 int a1, a2, a3, a4, b1, b2, b3, b4, comment = 0; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
611 unsigned short directive = 0; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
612 |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
613 bzero(current, sizeof(subtitle)); |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
614 bzero(commands, sizeof(char) * LINE_LEN); |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
615 bzero(line1, sizeof(char) * LINE_LEN); |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
616 bzero(line2, sizeof(char) * LINE_LEN); |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
617 while (!current->text[0]) { |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
618 if (!fgets(line1, LINE_LEN, fd)) |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
619 return NULL; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
620 if (sscanf |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
621 (line1, "%d:%d:%d.%d %d:%d:%d.%d %[^\n\r]", &a1, &a2, &a3, &a4, |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
622 &b1, &b2, &b3, &b4, line2) < 9) |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
623 continue; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
624 //a Jacosub script *may* have some commands before the text, so let's recognize them |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
625 switch (toupper(line2[0])) { |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
626 case 'C': |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
627 switch (toupper(line2[1])) { |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
628 case 'F': |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
629 case 'P': |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
630 case 'S': |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
631 case 'B': |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
632 if (isdigit(line2[2])) |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
633 directive = 1; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
634 } |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
635 break; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
636 case 'D': |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
637 if ((line2[1] == ' ') || isdigit(line2[1])) |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
638 directive = 1; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
639 // special case |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
640 if (toupper(line2[1]) == 'C') |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
641 directive = 1; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
642 break; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
643 case 'E': |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
644 switch (toupper(line2[1])) { |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
645 case 'D': |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
646 case 'P': |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
647 if (isdigit(line2[2])) |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
648 directive = 1; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
649 break; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
650 case 'I': |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
651 if ((toupper(line2[2]) == 'O') && (isdigit(line2[3]))) |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
652 directive = 1; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
653 break; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
654 case 'R': |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
655 if ((toupper(line2[2]) == 'D') && (isdigit(line2[3]))) |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
656 directive = 1; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
657 break; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
658 case 'W': |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
659 if ((toupper(line2[2]) == 'L') |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
660 || (toupper(line2[2]) == 'R')) |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
661 directive = 1; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
662 break; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
663 } |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
664 break; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
665 case 'F': |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
666 if (isdigit(line2[1])) |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
667 directive = 1; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
668 else |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
669 switch (toupper(line2[1])) { |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
670 case 'O': |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
671 if (isdigit(line2[2])) |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
672 directive = 1; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
673 break; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
674 case 'S': |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
675 directive = 1; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
676 } |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
677 break; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
678 case 'G': |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
679 if ((line2[1] == 'G') && (isdigit(line2[2]))) |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
680 directive = 2; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
681 break; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
682 case 'H': |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
683 switch (toupper(line2[1])) { |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
684 case 'L': |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
685 case 'R': |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
686 if (isdigit(line2[2])) |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
687 directive = 1; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
688 } |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
689 break; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
690 case 'J': |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
691 switch (toupper(line2[1])) { |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
692 case 'B': |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
693 if (toupper(line2[2]) == 'C') |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
694 directive = 1; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
695 break; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
696 case 'C': |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
697 case 'L': |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
698 case 'R': |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
699 directive = 1; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
700 break; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
701 case 'F': |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
702 if ((line2[2] == ':') && (toupper(line2[3]) == 'L')) |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
703 directive = 1; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
704 } |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
705 break; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
706 case 'R': |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
707 if (((toupper(line2[1]) == 'D') && (toupper(line2[2]) == 'B')) |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
708 || ((toupper(line2[1]) == 'D') |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
709 && (toupper(line2[2]) == 'C')) |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
710 || ((toupper(line2[1]) == 'L') |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
711 && (toupper(line2[2]) == 'B'))) |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
712 directive = 2; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
713 break; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
714 case 'V': |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
715 switch (toupper(line2[1])) { |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
716 case 'A': |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
717 case 'B': |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
718 case 'M': |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
719 case 'T': |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
720 case 'U': |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
721 directive = 1; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
722 break; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
723 case 'L': |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
724 case 'P': |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
725 if (isdigit(line2[2])) |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
726 directive = 1; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
727 } |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
728 break; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
729 case '[': |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
730 directive = 1; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
731 break; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
732 case '~': |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
733 directive = 2; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
734 } |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
735 if (directive == 1) { |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
736 strcpy(line1, line2); |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
737 sscanf(line1, "%s %[^\n\r]", commands, line2); |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
738 } else if (directive == 2) { |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
739 continue; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
740 } |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
741 current->start = a1 * 360000 + a2 * 6000 + a3 * 100 + a4; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
742 current->end = b1 * 360000 + b2 * 6000 + b3 * 100 + b4; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
743 current->lines = 0; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
744 |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
745 q = text; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
746 p = line2; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
747 while ((*p) == ' ') |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
748 p++; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
749 |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
750 for (; (!eol(*p)) && (current->lines < SUB_MAX_TEXT); p++) { |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
751 switch (*p) { |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
752 case '{': |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
753 comment++; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
754 break; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
755 case '}': |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
756 comment--; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
757 //the next to get rid of a blank after the comment |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
758 if ((*(p + 1)) == ' ') |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
759 p++; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
760 break; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
761 case '\\': |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
762 if (*(p + 1) == 'n') { |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
763 *q = '\0'; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
764 q = text; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
765 current->text[current->lines++] = strdup(text); |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
766 p++; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
767 break; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
768 } else if (toupper(*(p + 1)) == 'C') { |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
769 p++; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
770 p++; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
771 break; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
772 } else if ((toupper(*(p + 1)) == 'I') |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
773 || (toupper(*(p + 1)) == 'B') |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
774 || (toupper(*(p + 1)) == 'N')) { |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
775 p++; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
776 break; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
777 } else if (eol(*(p + 1))) { |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
778 if (!fgets(line1, LINE_LEN, fd)) |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
779 return NULL; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
780 trail_space(line1); |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
781 p = line1; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
782 } |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
783 default: |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
784 if (!comment) { |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
785 *q = *p; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
786 q++; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
787 } |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
788 } |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
789 } |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
790 *q = '\0'; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
791 current->text[current->lines] = strdup(text); |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
792 } |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
793 current->lines++; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
794 return current; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
795 } |
6076
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
796 |
258 | 797 int sub_autodetect (FILE *fd) { |
2912 | 798 char line[LINE_LEN+1]; |
258 | 799 int i,j=0; |
2177 | 800 char p; |
258 | 801 |
624 | 802 while (j < 100) { |
258 | 803 j++; |
2912 | 804 if (!fgets (line, LINE_LEN, fd)) |
805 return SUB_INVALID; | |
258 | 806 |
624 | 807 if (sscanf (line, "{%d}{%d}", &i, &i)==2) |
2912 | 808 {sub_uses_time=0;return SUB_MICRODVD;} |
4519 | 809 if (sscanf (line, "{%d}{}", &i)==1) |
4444 | 810 {sub_uses_time=0;return SUB_MICRODVD;} |
269 | 811 if (sscanf (line, "%d:%d:%d.%d,%d:%d:%d.%d", &i, &i, &i, &i, &i, &i, &i, &i)==8) |
2912 | 812 {sub_uses_time=1;return SUB_SUBRIP;} |
269 | 813 if (sscanf (line, "%d:%d:%d,%d --> %d:%d:%d,%d", &i, &i, &i, &i, &i, &i, &i, &i)==8) |
2912 | 814 {sub_uses_time=1;return SUB_SUBVIEWER;} |
6012 | 815 if (sscanf (line, "{T %d:%d:%d:%d",&i, &i, &i, &i)) |
816 {sub_uses_time=1;return SUB_SUBVIEWER2;} | |
624 | 817 if (strstr (line, "<SAMI>")) |
2912 | 818 {sub_uses_time=1; return SUB_SAMI;} |
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
819 if (sscanf(line, "%d:%d:%d.%d %d:%d:%d.%d", &i, &i, &i, &i, &i, &i, &i, &i) == 8) |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
820 {sub_uses_time = 1; return SUB_JACOSUB;} |
818 | 821 if (sscanf (line, "%d:%d:%d:", &i, &i, &i )==3) |
2912 | 822 {sub_uses_time=1;return SUB_VPLAYER;} |
5363
1f068f4bb6e7
vplayer sub fix by Arkadiusz Podgorski <wodzu@softomat.com.pl>
arpi
parents:
4886
diff
changeset
|
823 if (sscanf (line, "%d:%d:%d ", &i, &i, &i )==3) |
1f068f4bb6e7
vplayer sub fix by Arkadiusz Podgorski <wodzu@softomat.com.pl>
arpi
parents:
4886
diff
changeset
|
824 {sub_uses_time=1;return SUB_VPLAYER;} |
850 | 825 //TODO: just checking if first line of sub starts with "<" is WAY |
913
18c43d261c35
corrected strcmp() bug, now it works again with every subs (it was broken)
laaz
parents:
896
diff
changeset
|
826 // too weak test for RT |
18c43d261c35
corrected strcmp() bug, now it works again with every subs (it was broken)
laaz
parents:
896
diff
changeset
|
827 // Please someone who knows the format of RT... FIX IT!!! |
921 | 828 // It may conflict with other sub formats in the future (actually it doesn't) |
913
18c43d261c35
corrected strcmp() bug, now it works again with every subs (it was broken)
laaz
parents:
896
diff
changeset
|
829 if ( *line == '<' ) |
2912 | 830 {sub_uses_time=1;return SUB_RT;} |
921 | 831 |
832 if (!memcmp(line, "Dialogue: Marked", 16)) | |
2912 | 833 {sub_uses_time=1; return SUB_SSA;} |
1081 | 834 if (sscanf (line, "%d,%d,\"%c", &i, &i, (char *) &i) == 3) |
2912 | 835 {sub_uses_time=0;return SUB_DUNNOWHAT;} |
2177 | 836 if (sscanf (line, "FORMAT=%d", &i) == 1) |
2912 | 837 {sub_uses_time=0; return SUB_MPSUB;} |
2177 | 838 if (sscanf (line, "FORMAT=TIM%c", &p)==1 && p=='E') |
2912 | 839 {sub_uses_time=1; return SUB_MPSUB;} |
2343 | 840 if (strstr (line, "-->>")) |
6076
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
841 {sub_uses_time=0; return SUB_AQTITLE;} |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
842 if (sscanf (line, "[%d:%d:%d]", &i, &i, &i)==3) |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
843 {sub_uses_time=1;return SUB_SUBRIP09;} |
258 | 844 } |
624 | 845 |
2912 | 846 return SUB_INVALID; // too many bad lines |
258 | 847 } |
2449
7ef89d9b06ed
added DUMPSUBS recognition if we need compile only subreader.c alone
atlka
parents:
2358
diff
changeset
|
848 |
7ef89d9b06ed
added DUMPSUBS recognition if we need compile only subreader.c alone
atlka
parents:
2358
diff
changeset
|
849 #ifdef DUMPSUBS |
7ef89d9b06ed
added DUMPSUBS recognition if we need compile only subreader.c alone
atlka
parents:
2358
diff
changeset
|
850 int sub_utf8=0; |
7ef89d9b06ed
added DUMPSUBS recognition if we need compile only subreader.c alone
atlka
parents:
2358
diff
changeset
|
851 #else |
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
852 extern int sub_utf8; |
2449
7ef89d9b06ed
added DUMPSUBS recognition if we need compile only subreader.c alone
atlka
parents:
2358
diff
changeset
|
853 #endif |
258 | 854 |
4886 | 855 extern float sub_delay; |
856 extern float sub_fps; | |
857 | |
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
858 #ifdef USE_ICONV |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
859 static iconv_t icdsc; |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
860 |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
861 void subcp_open (void) |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
862 { |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
863 char *tocp = "UTF-8"; |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
864 icdsc = (iconv_t)(-1); |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
865 if (sub_cp){ |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
866 if ((icdsc = iconv_open (tocp, sub_cp)) != (iconv_t)(-1)){ |
6296 | 867 mp_msg(MSGT_SUBREADER,MSGL_V,"SUB: opened iconv descriptor.\n"); |
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
868 sub_utf8 = 2; |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
869 } else |
6296 | 870 mp_msg(MSGT_SUBREADER,MSGL_ERR,"SUB: error opening iconv descriptor.\n"); |
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
871 } |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
872 } |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
873 |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
874 void subcp_close (void) |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
875 { |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
876 if (icdsc != (iconv_t)(-1)){ |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
877 (void) iconv_close (icdsc); |
6296 | 878 mp_msg(MSGT_SUBREADER,MSGL_V,"SUB: closed iconv descriptor.\n"); |
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
879 } |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
880 } |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
881 |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
882 #define ICBUFFSIZE 512 |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
883 static char icbuffer[ICBUFFSIZE]; |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
884 |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
885 subtitle* subcp_recode (subtitle *sub) |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
886 { |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
887 int l=sub->lines; |
7472
c4434bdf6e51
tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
arpi
parents:
7460
diff
changeset
|
888 size_t ileft, oleft; |
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
889 char *op, *ip, *ot; |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
890 |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
891 while (l){ |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
892 op = icbuffer; |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
893 ip = sub->text[--l]; |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
894 ileft = strlen(ip); |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
895 oleft = ICBUFFSIZE - 1; |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
896 |
6163
141a082e6da6
applied 64bit patch from Ulrich Hecht <uli at suse dot de>
alex
parents:
6076
diff
changeset
|
897 if (iconv(icdsc, &ip, &ileft, |
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
898 &op, &oleft) == (size_t)(-1)) { |
6296 | 899 mp_msg(MSGT_SUBREADER,MSGL_WARN,"SUB: error recoding line.\n"); |
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
900 l++; |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
901 break; |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
902 } |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
903 if (!(ot = (char *)malloc(op - icbuffer + 1))){ |
6296 | 904 mp_msg(MSGT_SUBREADER,MSGL_WARN,"SUB: error allocating mem.\n"); |
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
905 l++; |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
906 break; |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
907 } |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
908 *op='\0' ; |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
909 strcpy (ot, icbuffer); |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
910 free (sub->text[l]); |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
911 sub->text[l] = ot; |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
912 } |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
913 if (l){ |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
914 for (l = sub->lines; l;) |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
915 free (sub->text[--l]); |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
916 return ERR; |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
917 } |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
918 return sub; |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
919 } |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
920 |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
921 #endif |
258 | 922 |
7983
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
923 static void adjust_subs_time(subtitle* sub, float subtime, float fps, int block){ |
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
924 int n,m; |
4052
505f206d80d1
corrections to adjust_subs_time function which now uses fps if needed
atlka
parents:
4051
diff
changeset
|
925 subtitle* nextsub; |
4051
0e7c382bc53a
added adjust_subs_time function which corrects bad sub->end time
atlka
parents:
4048
diff
changeset
|
926 int i = sub_num; |
4052
505f206d80d1
corrections to adjust_subs_time function which now uses fps if needed
atlka
parents:
4051
diff
changeset
|
927 unsigned long subfms = (sub_uses_time ? 100 : fps) * subtime; |
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
928 |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
929 n=m=0; |
7610 | 930 if (i) for (;;){ |
7983
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
931 if (!block) |
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
932 if (sub->end <= sub->start){ |
4052
505f206d80d1
corrections to adjust_subs_time function which now uses fps if needed
atlka
parents:
4051
diff
changeset
|
933 sub->end = sub->start + subfms; |
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
934 m++; |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
935 n++; |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
936 } |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
937 if (!--i) break; |
4051
0e7c382bc53a
added adjust_subs_time function which corrects bad sub->end time
atlka
parents:
4048
diff
changeset
|
938 nextsub = sub + 1; |
7983
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
939 if (block){ |
4051
0e7c382bc53a
added adjust_subs_time function which corrects bad sub->end time
atlka
parents:
4048
diff
changeset
|
940 if (sub->end >= nextsub->start){ |
0e7c382bc53a
added adjust_subs_time function which corrects bad sub->end time
atlka
parents:
4048
diff
changeset
|
941 sub->end = nextsub->start - 1; |
4052
505f206d80d1
corrections to adjust_subs_time function which now uses fps if needed
atlka
parents:
4051
diff
changeset
|
942 if (sub->end - sub->start > subfms) |
505f206d80d1
corrections to adjust_subs_time function which now uses fps if needed
atlka
parents:
4051
diff
changeset
|
943 sub->end = sub->start + subfms; |
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
944 if (!m) |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
945 n++; |
4051
0e7c382bc53a
added adjust_subs_time function which corrects bad sub->end time
atlka
parents:
4048
diff
changeset
|
946 } |
7610 | 947 |
948 /* Theory: | |
949 * Movies are often converted from FILM (24 fps) | |
950 * to PAL (25) by simply speeding it up, so we | |
951 * to multiply the original timestmaps by | |
952 * (Movie's FPS / Subtitle's (guessed) FPS) | |
953 * so eg. for 23.98 fps movie and PAL time based | |
954 * subtitles we say -subfps 25 and we're fine! | |
955 */ | |
956 | |
957 /* timed sub fps correction ::atmos */ | |
958 if(sub_uses_time && sub_fps) { | |
959 sub->start *= sub_fps/fps; | |
960 sub->end *= sub_fps/fps; | |
961 } | |
7983
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
962 } |
7610 | 963 |
4051
0e7c382bc53a
added adjust_subs_time function which corrects bad sub->end time
atlka
parents:
4048
diff
changeset
|
964 sub = nextsub; |
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
965 m = 0; |
4051
0e7c382bc53a
added adjust_subs_time function which corrects bad sub->end time
atlka
parents:
4048
diff
changeset
|
966 } |
6296 | 967 if (n) mp_msg(MSGT_SUBREADER,MSGL_INFO,"SUB: Adjusted %d subtitle(s).\n", n); |
4051
0e7c382bc53a
added adjust_subs_time function which corrects bad sub->end time
atlka
parents:
4048
diff
changeset
|
968 } |
0e7c382bc53a
added adjust_subs_time function which corrects bad sub->end time
atlka
parents:
4048
diff
changeset
|
969 |
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
970 subtitle* sub_read_file (char *filename, float fps) { |
258 | 971 FILE *fd; |
7983
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
972 int n_max, n_first, i, j, sub_first, sub_orig; |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
973 subtitle *first, *second; |
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
974 char *fmtname[] = { "microdvd", "subrip", "subviewer", "sami", "vplayer", |
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
975 "rt", "ssa", "dunnowhat", "mpsub", "aqt", "subviewer 2.0", "subrip 0.9", "jacosub" }; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
976 subtitle * (*func[])(FILE *fd,subtitle *dest)= |
258 | 977 { |
978 sub_read_line_microdvd, | |
979 sub_read_line_subrip, | |
2912 | 980 sub_read_line_subviewer, |
818 | 981 sub_read_line_sami, |
850 | 982 sub_read_line_vplayer, |
921 | 983 sub_read_line_rt, |
1081 | 984 sub_read_line_ssa, |
2177 | 985 sub_read_line_dunnowhat, |
2343 | 986 sub_read_line_mpsub, |
6012 | 987 sub_read_line_aqt, |
6076
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
988 sub_read_line_subviewer2, |
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
989 sub_read_line_subrip09, |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
990 sub_read_line_jacosub |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
991 |
258 | 992 }; |
2915 | 993 if(filename==NULL) return NULL; //qnx segfault |
258 | 994 fd=fopen (filename, "r"); if (!fd) return NULL; |
995 | |
996 sub_format=sub_autodetect (fd); | |
6296 | 997 if (sub_format==SUB_INVALID) {mp_msg(MSGT_SUBREADER,MSGL_WARN,"SUB: Could not determine file format\n");return NULL;} |
998 mp_msg(MSGT_SUBREADER,MSGL_INFO,"SUB: Detected subtitle file format: %s\n", fmtname[sub_format]); | |
258 | 999 |
1000 rewind (fd); | |
1001 | |
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1002 #ifdef USE_ICONV |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1003 subcp_open(); |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1004 #endif |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1005 |
258 | 1006 sub_num=0;n_max=32; |
1007 first=(subtitle *)malloc(n_max*sizeof(subtitle)); | |
1008 if(!first) return NULL; | |
1009 | |
1010 while(1){ | |
1011 subtitle *sub; | |
1012 if(sub_num>=n_max){ | |
1013 n_max+=16; | |
1014 first=realloc(first,n_max*sizeof(subtitle)); | |
1015 } | |
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1016 sub = &first[sub_num]; |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1017 memset(sub, '\0', sizeof(subtitle)); |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1018 sub=func[sub_format](fd,sub); |
258 | 1019 if(!sub) break; // EOF |
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1020 #ifdef USE_ICONV |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1021 if ((sub!=ERR) && (sub_utf8 & 2)) sub=subcp_recode(sub); |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1022 #endif |
258 | 1023 if(sub==ERR) ++sub_errs; else ++sub_num; // Error vs. Valid |
1024 } | |
1025 | |
1026 fclose(fd); | |
1027 | |
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1028 #ifdef USE_ICONV |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1029 subcp_close(); |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1030 #endif |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1031 |
258 | 1032 // printf ("SUB: Subtitle format %s time.\n", sub_uses_time?"uses":"doesn't use"); |
6296 | 1033 mp_msg(MSGT_SUBREADER,MSGL_INFO,"SUB: Read %i subtitles", sub_num); |
1034 if (sub_errs) mp_msg(MSGT_SUBREADER,MSGL_INFO,", %i bad line(s).\n", sub_errs); | |
1035 else mp_msg(MSGT_SUBREADER,MSGL_INFO,".\n"); | |
258 | 1036 |
2880 | 1037 if(sub_num<=0){ |
1038 free(first); | |
1039 return NULL; | |
1040 } | |
1041 | |
7983
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1042 adjust_subs_time(first, 6.0, fps, 0); /* ~6 secs AST */ |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1043 |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1044 // here we manage overlapping subtitles |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1045 sub_orig = sub_num; |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1046 n_first = sub_num; |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1047 n_max = 0; |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1048 sub_num = 0; |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1049 second = NULL; |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1050 // for each subtitle in first[] |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1051 for (sub_first = 0; sub_first < n_first; ++sub_first) { |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1052 while (first[sub_first].start <= first[sub_first].end) { |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1053 unsigned long end_time = first[sub_first].end; |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1054 int lines_to_add = 0, sub_to_add, event, ls, lf; |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1055 |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1056 // there is a new subtitle, so let's make second[] bigger |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1057 n_max += 1; |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1058 second = realloc(second, n_max * sizeof(subtitle)); |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1059 memset(&second[n_max - 1], '\0', sizeof(subtitle)); |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1060 |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1061 // find the number of lines and subtitles that overlap the current subtitle |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1062 for (sub_to_add = 0; |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1063 (end_time > first[sub_first + sub_to_add + 1].start) |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1064 && (sub_first + sub_to_add + 1 < n_first); ++sub_to_add) { |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1065 lines_to_add += first[sub_first + sub_to_add + 1].lines; |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1066 } |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1067 if ((lines_to_add > 0) |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1068 && (first[sub_first].lines + lines_to_add < |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1069 SUB_MAX_TEXT)) { |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1070 unsigned long next; |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1071 |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1072 // find next beginning-of-a-subtitle time |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1073 next = first[sub_first].end + 1; |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1074 event = sub_first; |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1075 for (j = 0; j < lines_to_add; j++) { |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1076 if ((first[sub_first + j + 1].end + 1 < next) |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1077 && (first[sub_first + j + 1].end >= |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1078 first[sub_first].start)) { |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1079 event = sub_first + j + 1; |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1080 next = first[event].end + 1; |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1081 } |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1082 if ((first[sub_first + j + 1].start < next) |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1083 && (first[sub_first + j + 1].start > |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1084 first[sub_first].start)) { |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1085 event = sub_first + j + 1; |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1086 next = first[event].start; |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1087 } |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1088 } |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1089 second[sub_num].start = first[sub_first].start; |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1090 second[sub_num].end = next - 1; |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1091 second[sub_num].lines = first[sub_first].lines; |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1092 for (ls = 0, lf = 0; ls < second[sub_num].lines; ls++, lf++) { |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1093 second[sub_num].text[ls] = |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1094 strdup(first[sub_first].text[lf]); |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1095 } |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1096 for (j = 0; j < sub_to_add; j++) { |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1097 if ((first[sub_first + j + 1].start <= |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1098 second[sub_num].start) |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1099 && (first[sub_first + j + 1].end >= |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1100 second[sub_num].end) |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1101 && (second[sub_num].lines + |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1102 first[sub_first + j + 1].lines <= |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1103 SUB_MAX_TEXT)) { |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1104 for (lf = 0; lf < first[sub_first + j + 1].lines; |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1105 lf++, ls++) |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1106 second[sub_num].text[ls] = |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1107 strdup(first[sub_first + j + 1].text[lf]); |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1108 first[sub_first + j + 1].start = next; |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1109 } else |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1110 for (lf = 0; lf < first[sub_first + j + 1].lines; |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1111 lf++, ls++) |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1112 second[sub_num].text[ls] = strdup(" "); |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1113 second[sub_num].lines += |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1114 first[sub_first + j + 1].lines; |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1115 } |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1116 first[sub_first].start = next; |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1117 } else { |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1118 second[sub_num].start = first[sub_first].start; |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1119 second[sub_num].end = first[sub_first].end; |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1120 second[sub_num].lines = first[sub_first].lines; |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1121 for (ls = 0; ls < second[sub_num].lines; ls++) |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1122 second[sub_num].text[ls] = |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1123 strdup(first[sub_first].text[ls]); |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1124 first[sub_first].start = first[sub_first].end + 1; |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1125 } |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1126 ++sub_num; |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1127 } // while |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1128 } |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1129 adjust_subs_time(second, 6.0, fps, 1); /* ~6 secs AST */ |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1130 |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1131 for (j = sub_orig - 1; j <= 0; --j) { |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1132 for (i = first[j].lines - 1; i <= 0; --i) { |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1133 free(first[j].text[i]); |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1134 } |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1135 free(&first[j]); |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1136 } |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1137 |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1138 return second; |
258 | 1139 } |
1140 | |
892 | 1141 #if 0 |
509 | 1142 char * strreplace( char * in,char * what,char * whereof ) |
1143 { | |
1144 int i; | |
1145 char * tmp; | |
1146 | |
1147 if ( ( in == NULL )||( what == NULL )||( whereof == NULL )||( ( tmp=strstr( in,what ) ) == NULL ) ) return NULL; | |
1148 for( i=0;i<strlen( whereof );i++ ) tmp[i]=whereof[i]; | |
1149 if ( strlen( what ) > strlen( whereof ) ) tmp[i]=0; | |
1150 return in; | |
1151 } | |
892 | 1152 #endif |
509 | 1153 |
892 | 1154 char * sub_filename(char* path, char * fname ) |
509 | 1155 { |
892 | 1156 char * sub_name1; |
1157 char * sub_name2; | |
934
b2c7c4b49948
Gabucino (CGA user)'s request (finds default.subs well)
laaz
parents:
932
diff
changeset
|
1158 char * aviptr1, * aviptr2, * tmp; |
892 | 1159 int i,j; |
1160 FILE * f; | |
1161 int pos=0; | |
1162 char * sub_exts[] = | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1081
diff
changeset
|
1163 { ".utf", |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1081
diff
changeset
|
1164 ".UTF", |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1081
diff
changeset
|
1165 ".sub", |
509 | 1166 ".SUB", |
1167 ".srt", | |
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
1168 ".SRT", |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
1169 ".smi", |
850 | 1170 ".SMI", |
1171 ".rt", | |
1172 ".RT", | |
1173 ".txt", | |
1081 | 1174 ".TXT", |
1175 ".ssa", | |
2343 | 1176 ".SSA", |
1177 ".aqt", | |
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
1178 ".AQT", |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
1179 ".js", |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
1180 ".JS" }; |
892 | 1181 |
934
b2c7c4b49948
Gabucino (CGA user)'s request (finds default.subs well)
laaz
parents:
932
diff
changeset
|
1182 |
509 | 1183 if ( fname == NULL ) return NULL; |
892 | 1184 |
1185 sub_name1=strrchr(fname,'.'); | |
1186 if (!sub_name1) return NULL; | |
1187 pos=sub_name1-fname; | |
1188 | |
934
b2c7c4b49948
Gabucino (CGA user)'s request (finds default.subs well)
laaz
parents:
932
diff
changeset
|
1189 sub_name1=malloc(strlen(fname)+8); |
b2c7c4b49948
Gabucino (CGA user)'s request (finds default.subs well)
laaz
parents:
932
diff
changeset
|
1190 strcpy(sub_name1,fname); |
b2c7c4b49948
Gabucino (CGA user)'s request (finds default.subs well)
laaz
parents:
932
diff
changeset
|
1191 |
b2c7c4b49948
Gabucino (CGA user)'s request (finds default.subs well)
laaz
parents:
932
diff
changeset
|
1192 sub_name2=malloc (strlen(path) + strlen(fname) + 8); |
1081 | 1193 if ((tmp=strrchr(fname,'/'))) |
934
b2c7c4b49948
Gabucino (CGA user)'s request (finds default.subs well)
laaz
parents:
932
diff
changeset
|
1194 sprintf (sub_name2, "%s%s", path, tmp+1); |
b2c7c4b49948
Gabucino (CGA user)'s request (finds default.subs well)
laaz
parents:
932
diff
changeset
|
1195 else |
b2c7c4b49948
Gabucino (CGA user)'s request (finds default.subs well)
laaz
parents:
932
diff
changeset
|
1196 sprintf (sub_name2, "%s%s", path, fname); |
b2c7c4b49948
Gabucino (CGA user)'s request (finds default.subs well)
laaz
parents:
932
diff
changeset
|
1197 |
b2c7c4b49948
Gabucino (CGA user)'s request (finds default.subs well)
laaz
parents:
932
diff
changeset
|
1198 aviptr1=strrchr(sub_name1,'.'); |
b2c7c4b49948
Gabucino (CGA user)'s request (finds default.subs well)
laaz
parents:
932
diff
changeset
|
1199 aviptr2=strrchr(sub_name2,'.'); |
892 | 1200 |
1201 for(j=0;j<=1;j++){ | |
1202 char* sub_name=j?sub_name1:sub_name2; | |
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1203 #ifdef USE_ICONV |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1204 for ( i=(sub_cp?2:0);i<(sizeof(sub_exts)/sizeof(char*));i++ ) { |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1205 #else |
892 | 1206 for ( i=0;i<(sizeof(sub_exts)/sizeof(char*));i++ ) { |
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1207 #endif |
934
b2c7c4b49948
Gabucino (CGA user)'s request (finds default.subs well)
laaz
parents:
932
diff
changeset
|
1208 strcpy(j?aviptr1:aviptr2,sub_exts[i]); |
935 | 1209 // printf("trying: '%s'\n",sub_name); |
892 | 1210 if((f=fopen( sub_name,"rt" ))) { |
509 | 1211 fclose( f ); |
6296 | 1212 mp_msg(MSGT_SUBREADER,MSGL_INFO,"SUB: Detected sub file: %s\n",sub_name ); |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1081
diff
changeset
|
1213 if (i<2) sub_utf8=1; |
509 | 1214 return sub_name; |
892 | 1215 } |
509 | 1216 } |
892 | 1217 } |
1218 | |
7775 | 1219 free(sub_name2); |
1220 free(sub_name1); | |
509 | 1221 return NULL; |
1222 } | |
1223 | |
1761 | 1224 void list_sub_file(subtitle* subs){ |
1225 int i,j; | |
1226 | |
1227 for(j=0;j<sub_num;j++){ | |
1228 subtitle* egysub=&subs[j]; | |
1229 printf ("%i line%c (%li-%li) ", | |
1230 egysub->lines, | |
1231 (1==egysub->lines)?' ':'s', | |
1232 egysub->start, | |
1233 egysub->end); | |
1234 for (i=0; i<egysub->lines; i++) { | |
1235 printf ("%s%s",egysub->text[i], i==egysub->lines-1?"":" <BREAK> "); | |
1236 } | |
1237 printf ("\n"); | |
1238 } | |
1239 | |
1240 printf ("Subtitle format %s time.\n", sub_uses_time?"uses":"doesn't use"); | |
1241 printf ("Read %i subtitles, %i errors.\n", sub_num, sub_errs); | |
1242 | |
1243 } | |
6792 | 1244 void dump_srt(subtitle* subs, float fps){ |
6208 | 1245 int i,j; |
1246 int h,m,s,ms; | |
1247 FILE * fd; | |
1248 subtitle * onesub; | |
1249 unsigned long temp; | |
1250 | |
6792 | 1251 if (!sub_uses_time && sub_fps == 0) |
1252 sub_fps = fps; | |
6208 | 1253 fd=fopen("dumpsub.srt","w"); |
1254 if(!fd) | |
1255 { | |
1256 perror("dump_srt: fopen"); | |
1257 return; | |
1258 } | |
1259 for(i=0;i<sub_num;i++) | |
1260 { | |
1261 onesub=subs+i; //=&subs[i]; | |
1262 fprintf(fd,"%d\n",i+1);//line number | |
1263 | |
1264 temp=onesub->start; | |
6792 | 1265 if (!sub_uses_time) |
1266 temp = temp * 100 / sub_fps; | |
1267 temp -= sub_delay * 100; | |
6208 | 1268 h=temp/360000;temp%=360000; //h =1*100*60*60 |
1269 m=temp/6000; temp%=6000; //m =1*100*60 | |
1270 s=temp/100; temp%=100; //s =1*100 | |
6792 | 1271 ms=temp*10; //ms=1*10 |
6208 | 1272 fprintf(fd,"%02d:%02d:%02d,%03d --> ",h,m,s,ms); |
1273 | |
1274 temp=onesub->end; | |
6792 | 1275 if (!sub_uses_time) |
1276 temp = temp * 100 / sub_fps; | |
1277 temp -= sub_delay * 100; | |
6208 | 1278 h=temp/360000;temp%=360000; |
1279 m=temp/6000; temp%=6000; | |
1280 s=temp/100; temp%=100; | |
6792 | 1281 ms=temp*10; |
6208 | 1282 fprintf(fd,"%02d:%02d:%02d,%03d\n",h,m,s,ms); |
1283 | |
1284 for(j=0;j<onesub->lines;j++) | |
1285 fprintf(fd,"%s\n",onesub->text[j]); | |
1286 | |
1287 fprintf(fd,"\n"); | |
1288 } | |
1289 fclose(fd); | |
6296 | 1290 mp_msg(MSGT_SUBREADER,MSGL_INFO,"SUB: Subtitles dumped in \'dumpsub.srt\'.\n"); |
6208 | 1291 } |
1761 | 1292 |
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1293 void dump_mpsub(subtitle* subs, float fps){ |
2178 | 1294 int i,j; |
1295 FILE *fd; | |
1296 float a,b; | |
1297 | |
4886 | 1298 mpsub_position=sub_uses_time?(sub_delay*100):(sub_delay*fps); |
1299 if (sub_fps==0) sub_fps=fps; | |
2178 | 1300 |
1301 fd=fopen ("dump.mpsub", "w"); | |
1302 if (!fd) { | |
1303 perror ("dump_mpsub: fopen"); | |
1304 return; | |
1305 } | |
1306 | |
1307 | |
1308 if (sub_uses_time) fprintf (fd,"FORMAT=TIME\n\n"); | |
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1309 else fprintf (fd, "FORMAT=%5.2f\n\n", fps); |
2178 | 1310 |
1311 for(j=0;j<sub_num;j++){ | |
2495 | 1312 subtitle* egysub=&subs[j]; |
1313 if (sub_uses_time) { | |
1314 a=((egysub->start-mpsub_position)/100.0); | |
1315 b=((egysub->end-egysub->start)/100.0); | |
1316 if ( (float)((int)a) == a) | |
1317 fprintf (fd, "%.0f",a); | |
1318 else | |
1319 fprintf (fd, "%.2f",a); | |
1320 | |
1321 if ( (float)((int)b) == b) | |
1322 fprintf (fd, " %.0f\n",b); | |
1323 else | |
1324 fprintf (fd, " %.2f\n",b); | |
1325 } else { | |
4886 | 1326 fprintf (fd, "%ld %ld\n", (long)((egysub->start*(fps/sub_fps))-((mpsub_position*(fps/sub_fps)))), |
1327 (long)(((egysub->end)-(egysub->start))*(fps/sub_fps))); | |
2495 | 1328 } |
1329 | |
1330 mpsub_position = egysub->end; | |
1331 for (i=0; i<egysub->lines; i++) { | |
1332 fprintf (fd, "%s\n",egysub->text[i]); | |
1333 } | |
1334 fprintf (fd, "\n"); | |
2178 | 1335 } |
1336 fclose (fd); | |
6296 | 1337 mp_msg(MSGT_SUBREADER,MSGL_INFO,"SUB: Subtitles dumped in \'dump.mpsub\'.\n"); |
2178 | 1338 } |
1339 | |
7460 | 1340 void dump_microdvd(subtitle* subs, float fps) { |
1341 int i, delay; | |
1342 FILE *fd; | |
1343 if (sub_fps == 0) | |
1344 sub_fps = fps; | |
1345 fd = fopen("dumpsub.txt", "w"); | |
1346 if (!fd) { | |
1347 perror("dumpsub.txt: fopen"); | |
1348 return; | |
1349 } | |
1350 delay = sub_delay * sub_fps; | |
1351 for (i = 0; i < sub_num; ++i) { | |
1352 int j, start, end; | |
1353 start = subs[i].start; | |
1354 end = subs[i].end; | |
1355 if (sub_uses_time) { | |
1356 start = start * sub_fps / 100 ; | |
1357 end = end * sub_fps / 100; | |
1358 } | |
1359 else { | |
1360 start = start * sub_fps / fps; | |
1361 end = end * sub_fps / fps; | |
1362 } | |
1363 start -= delay; | |
1364 end -= delay; | |
1365 fprintf(fd, "{%d}{%d}", start, end); | |
1366 for (j = 0; j < subs[i].lines; ++j) | |
1367 fprintf(fd, "%s%s", j ? "|" : "", subs[i].text[j]); | |
1368 fprintf(fd, "\n"); | |
1369 } | |
1370 fclose(fd); | |
1371 mp_msg(MSGT_SUBREADER,MSGL_INFO,"SUB: Subtitles dumped in \'dumpsub.txt\'.\n"); | |
1372 } | |
1373 | |
3543 | 1374 void sub_free( subtitle * subs ) |
1375 { | |
1376 int i; | |
1377 | |
1378 if ( !subs ) return; | |
1379 | |
1380 sub_num=0; | |
1381 sub_errs=0; | |
1382 for ( i=0;i<subs->lines;i++ ) free( subs->text[i] ); | |
1383 free( subs ); | |
1384 subs=NULL; | |
1385 } | |
2178 | 1386 |
2449
7ef89d9b06ed
added DUMPSUBS recognition if we need compile only subreader.c alone
atlka
parents:
2358
diff
changeset
|
1387 #ifdef DUMPSUBS |
258 | 1388 int main(int argc, char **argv) { // for testing |
1389 | |
1390 int i,j; | |
1391 subtitle *subs; | |
1392 subtitle *egysub; | |
1393 | |
1394 if(argc<2){ | |
1395 printf("\nUsage: subreader filename.sub\n\n"); | |
1396 exit(1); | |
1397 } | |
2449
7ef89d9b06ed
added DUMPSUBS recognition if we need compile only subreader.c alone
atlka
parents:
2358
diff
changeset
|
1398 sub_cp = argv[2]; |
624 | 1399 subs=sub_read_file(argv[1]); |
258 | 1400 if(!subs){ |
4886 | 1401 printf("Couldn't load file.\n"); |
258 | 1402 exit(1); |
1403 } | |
1761 | 1404 |
1405 list_sub_file(subs); | |
258 | 1406 |
1407 return 0; | |
1408 } | |
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
1409 #endif |