Mercurial > mplayer.hg
annotate subreader.c @ 15603:2d1ad16b6021
strdup subtitle filename at a more appropriate place, fixing memleaks and
double frees.
| author | reimar |
|---|---|
| date | Wed, 01 Jun 2005 09:01:41 +0000 |
| parents | 834bdc663f3f |
| children | 0ca3fb62d2da |
| 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 | |
| 11873 | 6 * |
| 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 |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
15 #include <sys/types.h> |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
16 #include <dirent.h> |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
17 |
|
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
18 #include "config.h" |
| 6296 | 19 #include "mp_msg.h" |
| 258 | 20 #include "subreader.h" |
| 21 | |
| 12443 | 22 #ifdef HAVE_ENCA |
| 23 #include <enca.h> | |
| 24 #endif | |
| 25 | |
| 3701 | 26 #define ERR ((void *) -1) |
| 258 | 27 |
|
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
28 #ifdef USE_ICONV |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
29 #include <iconv.h> |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
30 char *sub_cp=NULL; |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
31 #endif |
|
9635
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
32 #ifdef USE_FRIBIDI |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
33 #include <fribidi/fribidi.h> |
| 13680 | 34 char *fribidi_charset = NULL; ///character set that will be passed to FriBiDi |
| 35 int flip_hebrew = 1; ///flip subtitles using fribidi | |
| 36 int fribidi_flip_commas = 0; ///flip comma when fribidi is used | |
|
9635
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
37 #endif |
| 258 | 38 |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
39 extern char* dvdsub_lang; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
40 |
| 2912 | 41 /* Maximal length of line of a subtitle */ |
| 42 #define LINE_LEN 1000 | |
| 2178 | 43 static float mpsub_position=0; |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
44 static float mpsub_multiplier=1.; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
45 static int sub_slacktime = 20000; //20 sec |
| 2177 | 46 |
|
9126
7a06258271d6
Add a command line option (-sub-no-text-pp) to disable subtitles
arpi
parents:
9056
diff
changeset
|
47 int sub_no_text_pp=0; // 1 => do not apply text post-processing |
|
7a06258271d6
Add a command line option (-sub-no-text-pp) to disable subtitles
arpi
parents:
9056
diff
changeset
|
48 // like {\...} elimination in SSA format. |
| 2912 | 49 |
| 9893 | 50 int sub_match_fuzziness=0; // level of sub name matching fuzziness |
|
9884
d7b86f7d1406
turn most of the subtitle matching fuzziness off by default
henry
parents:
9872
diff
changeset
|
51 |
| 2912 | 52 /* Use the SUB_* constant defined in the header file */ |
| 53 int sub_format=SUB_INVALID; | |
|
8362
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
54 #ifdef USE_SORTSUB |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
55 /* |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
56 Some subtitling formats, namely AQT and Subrip09, define the end of a |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
57 subtitle as the beginning of the following. Since currently we read one |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
58 subtitle at time, for these format we keep two global *subtitle, |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
59 previous_aqt_sub and previous_subrip09_sub, pointing to previous subtitle, |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
60 so we can change its end when we read current subtitle starting time. |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
61 When USE_SORTSUB is defined, we use a single global unsigned long, |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
62 previous_sub_end, for both (and even future) formats, to store the end of |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
63 the previous sub: it is initialized to 0 in sub_read_file and eventually |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
64 modified by sub_read_aqt_line or sub_read_subrip09_line. |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
65 */ |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
66 unsigned long previous_sub_end; |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
67 #endif |
| 624 | 68 |
| 3701 | 69 static int eol(char p) { |
| 624 | 70 return (p=='\r' || p=='\n' || p=='\0'); |
| 71 } | |
| 72 | |
| 3701 | 73 /* Remove leading and trailing space */ |
| 74 static void trail_space(char *s) { | |
| 75 int i = 0; | |
|
3924
9f18722fafe9
tail_space infinite loop fix by jeon_goon@lycos.co.kr
arpi
parents:
3735
diff
changeset
|
76 while (isspace(s[i])) ++i; |
| 3701 | 77 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
|
78 i = strlen(s) - 1; |
|
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
79 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
|
80 } |
| 624 | 81 |
|
10692
7cb48ef05b02
Support for case insensitive string matching in SAMI subtitle files. Patch by Bruno Lecointre.
mosu
parents:
10649
diff
changeset
|
82 static char *stristr(const char *haystack, const char *needle) { |
|
7cb48ef05b02
Support for case insensitive string matching in SAMI subtitle files. Patch by Bruno Lecointre.
mosu
parents:
10649
diff
changeset
|
83 int len = 0; |
|
7cb48ef05b02
Support for case insensitive string matching in SAMI subtitle files. Patch by Bruno Lecointre.
mosu
parents:
10649
diff
changeset
|
84 const char *p = haystack; |
|
7cb48ef05b02
Support for case insensitive string matching in SAMI subtitle files. Patch by Bruno Lecointre.
mosu
parents:
10649
diff
changeset
|
85 |
|
7cb48ef05b02
Support for case insensitive string matching in SAMI subtitle files. Patch by Bruno Lecointre.
mosu
parents:
10649
diff
changeset
|
86 if (!(haystack && needle)) return NULL; |
|
7cb48ef05b02
Support for case insensitive string matching in SAMI subtitle files. Patch by Bruno Lecointre.
mosu
parents:
10649
diff
changeset
|
87 |
|
7cb48ef05b02
Support for case insensitive string matching in SAMI subtitle files. Patch by Bruno Lecointre.
mosu
parents:
10649
diff
changeset
|
88 len=strlen(needle); |
|
7cb48ef05b02
Support for case insensitive string matching in SAMI subtitle files. Patch by Bruno Lecointre.
mosu
parents:
10649
diff
changeset
|
89 while (*p != '\0') { |
|
7cb48ef05b02
Support for case insensitive string matching in SAMI subtitle files. Patch by Bruno Lecointre.
mosu
parents:
10649
diff
changeset
|
90 if (strncasecmp(p, needle, len) == 0) return (char*)p; |
|
7cb48ef05b02
Support for case insensitive string matching in SAMI subtitle files. Patch by Bruno Lecointre.
mosu
parents:
10649
diff
changeset
|
91 p++; |
|
7cb48ef05b02
Support for case insensitive string matching in SAMI subtitle files. Patch by Bruno Lecointre.
mosu
parents:
10649
diff
changeset
|
92 } |
|
7cb48ef05b02
Support for case insensitive string matching in SAMI subtitle files. Patch by Bruno Lecointre.
mosu
parents:
10649
diff
changeset
|
93 |
|
7cb48ef05b02
Support for case insensitive string matching in SAMI subtitle files. Patch by Bruno Lecointre.
mosu
parents:
10649
diff
changeset
|
94 return NULL; |
|
7cb48ef05b02
Support for case insensitive string matching in SAMI subtitle files. Patch by Bruno Lecointre.
mosu
parents:
10649
diff
changeset
|
95 } |
| 2343 | 96 |
| 624 | 97 subtitle *sub_read_line_sami(FILE *fd, subtitle *current) { |
| 2912 | 98 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
|
99 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
|
100 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
|
101 int state; |
| 624 | 102 |
|
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
103 current->lines = current->start = current->end = 0; |
|
13343
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
104 current->alignment = SUB_ALIGNMENT_BOTTOMCENTER; |
|
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
105 state = 0; |
| 624 | 106 |
|
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
107 /* read the first line */ |
|
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
108 if (!s) |
| 2912 | 109 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
|
110 |
| 624 | 111 do { |
|
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
112 switch (state) { |
|
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
113 |
|
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
|
114 case 0: /* find "START=" or "Slacktime:" */ |
|
10692
7cb48ef05b02
Support for case insensitive string matching in SAMI subtitle files. Patch by Bruno Lecointre.
mosu
parents:
10649
diff
changeset
|
115 slacktime_s = stristr (s, "Slacktime:"); |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
116 if (slacktime_s) |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
117 sub_slacktime = strtol (slacktime_s+10, NULL, 0) / 10; |
|
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
|
118 |
|
10692
7cb48ef05b02
Support for case insensitive string matching in SAMI subtitle files. Patch by Bruno Lecointre.
mosu
parents:
10649
diff
changeset
|
119 s = stristr (s, "Start="); |
|
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
120 if (s) { |
|
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
121 current->start = strtol (s + 6, &s, 0) / 10; |
|
11838
b4f1df0c1e3a
prevent subreader from segfaulting when sami subs dont have
attila
parents:
11496
diff
changeset
|
122 /* eat '>' */ |
|
b4f1df0c1e3a
prevent subreader from segfaulting when sami subs dont have
attila
parents:
11496
diff
changeset
|
123 for (; *s != '>' && *s != '\0'; s++); |
|
b4f1df0c1e3a
prevent subreader from segfaulting when sami subs dont have
attila
parents:
11496
diff
changeset
|
124 s++; |
|
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
125 state = 1; continue; |
|
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
126 } |
|
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
127 break; |
|
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
128 |
|
11838
b4f1df0c1e3a
prevent subreader from segfaulting when sami subs dont have
attila
parents:
11496
diff
changeset
|
129 case 1: /* find (optionnal) "<P", skip other TAGs */ |
|
b4f1df0c1e3a
prevent subreader from segfaulting when sami subs dont have
attila
parents:
11496
diff
changeset
|
130 for (; *s == ' ' || *s == '\t'; s++); /* strip blanks, if any */ |
|
b4f1df0c1e3a
prevent subreader from segfaulting when sami subs dont have
attila
parents:
11496
diff
changeset
|
131 if (*s == '\0') break; |
|
b4f1df0c1e3a
prevent subreader from segfaulting when sami subs dont have
attila
parents:
11496
diff
changeset
|
132 if (*s != '<') { state = 3; p = text; continue; } /* not a TAG */ |
|
b4f1df0c1e3a
prevent subreader from segfaulting when sami subs dont have
attila
parents:
11496
diff
changeset
|
133 s++; |
|
b4f1df0c1e3a
prevent subreader from segfaulting when sami subs dont have
attila
parents:
11496
diff
changeset
|
134 if (*s == 'P' || *s == 'p') { s++; state = 2; continue; } /* found '<P' */ |
|
b4f1df0c1e3a
prevent subreader from segfaulting when sami subs dont have
attila
parents:
11496
diff
changeset
|
135 for (; *s != '>' && *s != '\0'; s++); /* skip remains of non-<P> TAG */ |
|
b4f1df0c1e3a
prevent subreader from segfaulting when sami subs dont have
attila
parents:
11496
diff
changeset
|
136 if (s == '\0') |
|
b4f1df0c1e3a
prevent subreader from segfaulting when sami subs dont have
attila
parents:
11496
diff
changeset
|
137 break; |
|
b4f1df0c1e3a
prevent subreader from segfaulting when sami subs dont have
attila
parents:
11496
diff
changeset
|
138 s++; |
|
b4f1df0c1e3a
prevent subreader from segfaulting when sami subs dont have
attila
parents:
11496
diff
changeset
|
139 continue; |
|
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
140 |
|
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
141 case 2: /* find ">" */ |
|
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
142 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
|
143 break; |
|
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
144 |
|
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
145 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
|
146 if (*s == '\0') break; |
|
2836
ec672ea5ac2c
Applied SAMI patch by Evgeny Chukreev <codedj at echo dot ru>
atmos4
parents:
2495
diff
changeset
|
147 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
|
148 *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
|
149 if (text[0] != '\0') |
|
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
150 current->text[current->lines++] = strdup (text); |
|
2836
ec672ea5ac2c
Applied SAMI patch by Evgeny Chukreev <codedj at echo dot ru>
atmos4
parents:
2495
diff
changeset
|
151 s += 4; |
|
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
152 } |
|
12136
8f2e47faee88
skip {...} parts in SAME subs, patch by Salvatore Falco
alex
parents:
11873
diff
changeset
|
153 else if ((*s == '{') && !sub_no_text_pp) { state = 5; ++s; continue; } |
|
2836
ec672ea5ac2c
Applied SAMI patch by Evgeny Chukreev <codedj at echo dot ru>
atmos4
parents:
2495
diff
changeset
|
154 else if (*s == '<') { state = 4; } |
|
ec672ea5ac2c
Applied SAMI patch by Evgeny Chukreev <codedj at echo dot ru>
atmos4
parents:
2495
diff
changeset
|
155 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
|
156 else if (*s == '\t') { *p++ = ' '; s++; } |
|
ec672ea5ac2c
Applied SAMI patch by Evgeny Chukreev <codedj at echo dot ru>
atmos4
parents:
2495
diff
changeset
|
157 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
|
158 else *p++ = *s++; |
|
2836
ec672ea5ac2c
Applied SAMI patch by Evgeny Chukreev <codedj at echo dot ru>
atmos4
parents:
2495
diff
changeset
|
159 |
|
ec672ea5ac2c
Applied SAMI patch by Evgeny Chukreev <codedj at echo dot ru>
atmos4
parents:
2495
diff
changeset
|
160 /* skip duplicated space */ |
|
ec672ea5ac2c
Applied SAMI patch by Evgeny Chukreev <codedj at echo dot ru>
atmos4
parents:
2495
diff
changeset
|
161 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
|
162 |
| 624 | 163 continue; |
|
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
164 |
|
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
165 case 4: /* get current->end or skip <TAG> */ |
|
10692
7cb48ef05b02
Support for case insensitive string matching in SAMI subtitle files. Patch by Bruno Lecointre.
mosu
parents:
10649
diff
changeset
|
166 q = stristr (s, "Start="); |
|
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
167 if (q) { |
|
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
168 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
|
169 *p = '\0'; trail_space (text); |
|
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
170 if (text[0] != '\0') |
|
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
171 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
|
172 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
|
173 state = 0; continue; |
|
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
174 } |
|
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
175 s = strchr (s, '>'); |
|
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
176 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
|
177 break; |
|
13343
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
178 case 5: /* get rid of {...} text, but read the alignment code */ |
|
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
179 if ((*s == '\\') && (*(s + 1) == 'a') && !sub_no_text_pp) { |
|
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
180 if (stristr(s, "\\a1") != NULL) { |
|
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
181 current->alignment = SUB_ALIGNMENT_BOTTOMLEFT; |
|
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
182 s = s + 3; |
|
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
183 } |
|
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
184 if (stristr(s, "\\a2") != NULL) { |
|
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
185 current->alignment = SUB_ALIGNMENT_BOTTOMCENTER; |
|
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
186 s = s + 3; |
|
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
187 } else if (stristr(s, "\\a3") != NULL) { |
|
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
188 current->alignment = SUB_ALIGNMENT_BOTTOMRIGHT; |
|
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
189 s = s + 3; |
|
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
190 } else if ((stristr(s, "\\a4") != NULL) || (stristr(s, "\\a5") != NULL) || (stristr(s, "\\a8") != NULL)) { |
|
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
191 current->alignment = SUB_ALIGNMENT_TOPLEFT; |
|
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
192 s = s + 3; |
|
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
193 } else if (stristr(s, "\\a6") != NULL) { |
|
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
194 current->alignment = SUB_ALIGNMENT_TOPCENTER; |
|
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
195 s = s + 3; |
|
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
196 } else if (stristr(s, "\\a7") != NULL) { |
|
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
197 current->alignment = SUB_ALIGNMENT_TOPRIGHT; |
|
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
198 s = s + 3; |
|
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
199 } else if (stristr(s, "\\a9") != NULL) { |
|
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
200 current->alignment = SUB_ALIGNMENT_MIDDLELEFT; |
|
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
201 s = s + 3; |
|
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
202 } else if (stristr(s, "\\a10") != NULL) { |
|
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
203 current->alignment = SUB_ALIGNMENT_MIDDLECENTER; |
|
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
204 s = s + 4; |
|
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
205 } else if (stristr(s, "\\a11") != NULL) { |
|
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
206 current->alignment = SUB_ALIGNMENT_MIDDLERIGHT; |
|
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
207 s = s + 4; |
|
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
208 } |
|
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
209 } |
|
12136
8f2e47faee88
skip {...} parts in SAME subs, patch by Salvatore Falco
alex
parents:
11873
diff
changeset
|
210 if (*s == '}') state = 3; |
|
8f2e47faee88
skip {...} parts in SAME subs, patch by Salvatore Falco
alex
parents:
11873
diff
changeset
|
211 ++s; |
|
8f2e47faee88
skip {...} parts in SAME subs, patch by Salvatore Falco
alex
parents:
11873
diff
changeset
|
212 continue; |
| 624 | 213 } |
| 214 | |
|
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
215 /* read next line */ |
| 3735 | 216 if (state != 99 && !(s = fgets (line, LINE_LEN, fd))) { |
| 217 if (current->start > 0) { | |
| 218 break; // if it is the last subtitle | |
| 219 } else { | |
| 220 return 0; | |
| 221 } | |
| 222 } | |
|
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
|
223 |
|
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
224 } while (state != 99); |
| 624 | 225 |
|
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
|
226 // 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
|
227 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
|
228 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
|
229 *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
|
230 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
|
231 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
|
232 } |
|
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
|
233 |
| 624 | 234 return current; |
| 235 } | |
| 258 | 236 |
| 237 | |
| 238 char *sub_readtext(char *source, char **dest) { | |
| 239 int len=0; | |
| 932 | 240 char *p=source; |
| 258 | 241 |
|
6242
9c8c3b5e6658
possible sig11 fixed in .rt parser (weisskreuzova.zip)
arpi
parents:
6208
diff
changeset
|
242 // printf("src=%p dest=%p \n",source,dest); |
|
9c8c3b5e6658
possible sig11 fixed in .rt parser (weisskreuzova.zip)
arpi
parents:
6208
diff
changeset
|
243 |
| 932 | 244 while ( !eol(*p) && *p!= '|' ) { |
| 245 p++,len++; | |
| 246 } | |
| 258 | 247 |
| 248 *dest= (char *)malloc (len+1); | |
| 249 if (!dest) {return ERR;} | |
| 250 | |
| 251 strncpy(*dest, source, len); | |
| 252 (*dest)[len]=0; | |
| 253 | |
| 254 while (*p=='\r' || *p=='\n' || *p=='|') p++; | |
| 255 | |
| 256 if (*p) return p; // not-last text field | |
| 257 else return NULL; // last text field | |
| 258 } | |
| 259 | |
| 260 subtitle *sub_read_line_microdvd(FILE *fd,subtitle *current) { | |
| 2912 | 261 char line[LINE_LEN+1]; |
| 262 char line2[LINE_LEN+1]; | |
| 258 | 263 char *p, *next; |
| 264 int i; | |
| 265 | |
| 266 do { | |
| 2912 | 267 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
|
268 } while ((sscanf (line, |
|
654419a9a228
changed subreader.c to read microdvd lines in form "{%ld}{}[^\r\n]" too
atlka
parents:
3924
diff
changeset
|
269 "{%ld}{}%[^\r\n]", |
|
654419a9a228
changed subreader.c to read microdvd lines in form "{%ld}{}[^\r\n]" too
atlka
parents:
3924
diff
changeset
|
270 &(current->start), line2) < 2) && |
|
654419a9a228
changed subreader.c to read microdvd lines in form "{%ld}{}[^\r\n]" too
atlka
parents:
3924
diff
changeset
|
271 (sscanf (line, |
|
654419a9a228
changed subreader.c to read microdvd lines in form "{%ld}{}[^\r\n]" too
atlka
parents:
3924
diff
changeset
|
272 "{%ld}{%ld}%[^\r\n]", |
|
654419a9a228
changed subreader.c to read microdvd lines in form "{%ld}{}[^\r\n]" too
atlka
parents:
3924
diff
changeset
|
273 &(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
|
274 |
| 932 | 275 p=line2; |
| 258 | 276 |
| 277 next=p, i=0; | |
| 1081 | 278 while ((next =sub_readtext (next, &(current->text[i])))) { |
| 270 | 279 if (current->text[i]==ERR) {return ERR;} |
| 258 | 280 i++; |
| 6296 | 281 if (i>=SUB_MAX_TEXT) { mp_msg(MSGT_SUBREADER,MSGL_WARN,"Too many lines in a subtitle\n");current->lines=i;return current;} |
| 258 | 282 } |
| 932 | 283 current->lines= ++i; |
| 258 | 284 |
| 285 return current; | |
| 286 } | |
| 287 | |
|
12138
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
288 subtitle *sub_read_line_mpl2(FILE *fd,subtitle *current) { |
|
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
289 char line[LINE_LEN+1]; |
|
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
290 char line2[LINE_LEN+1]; |
|
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
291 char *p, *next; |
|
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
292 int i; |
|
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
293 |
|
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
294 do { |
|
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
295 if (!fgets (line, LINE_LEN, fd)) return NULL; |
|
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
296 } while ((sscanf (line, |
|
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
297 "[%ld][%ld]%[^\r\n]", |
|
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
298 &(current->start), &(current->end), line2) < 3)); |
|
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
299 current->start *= 10; |
|
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
300 current->end *= 10; |
|
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
301 p=line2; |
|
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
302 |
|
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
303 next=p, i=0; |
|
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
304 while ((next =sub_readtext (next, &(current->text[i])))) { |
|
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
305 if (current->text[i]==ERR) {return ERR;} |
|
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
306 i++; |
|
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
307 if (i>=SUB_MAX_TEXT) { mp_msg(MSGT_SUBREADER,MSGL_WARN,"Too many lines in a subtitle\n");current->lines=i;return current;} |
|
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
308 } |
|
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
309 current->lines= ++i; |
|
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
310 |
|
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
311 return current; |
|
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
312 } |
|
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
313 |
| 258 | 314 subtitle *sub_read_line_subrip(FILE *fd, subtitle *current) { |
| 2912 | 315 char line[LINE_LEN+1]; |
| 258 | 316 int a1,a2,a3,a4,b1,b2,b3,b4; |
| 317 char *p=NULL, *q=NULL; | |
| 318 int len; | |
| 319 | |
| 1764 | 320 while (1) { |
| 2912 | 321 if (!fgets (line, LINE_LEN, fd)) return NULL; |
| 269 | 322 if (sscanf (line, "%d:%d:%d.%d,%d:%d:%d.%d",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4) < 8) continue; |
| 258 | 323 current->start = a1*360000+a2*6000+a3*100+a4; |
| 324 current->end = b1*360000+b2*6000+b3*100+b4; | |
| 325 | |
| 2912 | 326 if (!fgets (line, LINE_LEN, fd)) return NULL; |
| 258 | 327 |
| 328 p=q=line; | |
| 329 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
|
330 for (q=p,len=0; *p && *p!='\r' && *p!='\n' && *p!='|' && strncmp(p,"[br]",4); p++,len++); |
| 258 | 331 current->text[current->lines-1]=(char *)malloc (len+1); |
| 332 if (!current->text[current->lines-1]) return ERR; | |
| 333 strncpy (current->text[current->lines-1], q, len); | |
| 270 | 334 current->text[current->lines-1][len]='\0'; |
| 258 | 335 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
|
336 if (*p=='|') p++; |
|
766b6fb28ebf
subrip sometimes uses pipe as newline separator - patch by MOLNAR Andor <dolphy@inf.elte.hu>
arpi
parents:
6597
diff
changeset
|
337 else while (*p++!=']'); |
| 258 | 338 } |
| 1764 | 339 break; |
| 258 | 340 } |
| 341 return current; | |
| 342 } | |
| 343 | |
| 2912 | 344 subtitle *sub_read_line_subviewer(FILE *fd,subtitle *current) { |
| 345 char line[LINE_LEN+1]; | |
| 258 | 346 int a1,a2,a3,a4,b1,b2,b3,b4; |
| 347 char *p=NULL; | |
| 348 int i,len; | |
| 349 | |
| 350 while (!current->text[0]) { | |
| 2912 | 351 if (!fgets (line, LINE_LEN, fd)) return NULL; |
|
9217
420e2b2f8e5a
compiler warning fixes patch by Dominik Mierzejewski <dominik@rangers.eu.org>
arpi
parents:
9145
diff
changeset
|
352 if ((len=sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d",&a1,&a2,&a3,(char *)&i,&a4,&b1,&b2,&b3,(char *)&i,&b4)) < 10) |
| 258 | 353 continue; |
| 354 current->start = a1*360000+a2*6000+a3*100+a4/10; | |
| 355 current->end = b1*360000+b2*6000+b3*100+b4/10; | |
| 356 for (i=0; i<SUB_MAX_TEXT;) { | |
| 2912 | 357 if (!fgets (line, LINE_LEN, fd)) break; |
| 258 | 358 len=0; |
| 359 for (p=line; *p!='\n' && *p!='\r' && *p; p++,len++); | |
| 360 if (len) { | |
|
7608
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
361 int j=0,skip=0; |
|
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
362 char *curptr=current->text[i]=(char *)malloc (len+1); |
| 258 | 363 if (!current->text[i]) return ERR; |
|
7608
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
364 //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
|
365 for(; j<len; j++) { |
|
7608
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
366 /* let's filter html tags ::atmos */ |
|
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
367 if(line[j]=='>') { |
|
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
368 skip=0; |
|
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
369 continue; |
|
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
370 } |
|
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
371 if(line[j]=='<') { |
|
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
372 skip=1; |
|
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
373 continue; |
|
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
374 } |
|
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
375 if(skip) { |
|
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
376 continue; |
|
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
377 } |
|
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
378 *curptr=line[j]; |
|
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
379 curptr++; |
|
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
380 } |
|
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
381 *curptr='\0'; |
|
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
382 |
| 258 | 383 i++; |
| 384 } else { | |
| 385 break; | |
| 386 } | |
| 387 } | |
| 388 current->lines=i; | |
| 389 } | |
| 390 return current; | |
| 391 } | |
| 392 | |
| 6012 | 393 subtitle *sub_read_line_subviewer2(FILE *fd,subtitle *current) { |
| 394 char line[LINE_LEN+1]; | |
| 395 int a1,a2,a3,a4; | |
| 396 char *p=NULL; | |
| 397 int i,len; | |
| 398 | |
| 399 while (!current->text[0]) { | |
| 400 if (!fgets (line, LINE_LEN, fd)) return NULL; | |
| 401 if (line[0]!='{') | |
| 402 continue; | |
| 403 if ((len=sscanf (line, "{T %d:%d:%d:%d",&a1,&a2,&a3,&a4)) < 4) | |
| 404 continue; | |
| 405 current->start = a1*360000+a2*6000+a3*100+a4/10; | |
| 406 for (i=0; i<SUB_MAX_TEXT;) { | |
| 407 if (!fgets (line, LINE_LEN, fd)) break; | |
| 408 if (line[0]=='}') break; | |
| 409 len=0; | |
| 410 for (p=line; *p!='\n' && *p!='\r' && *p; ++p,++len); | |
| 411 if (len) { | |
| 412 current->text[i]=(char *)malloc (len+1); | |
| 413 if (!current->text[i]) return ERR; | |
| 414 strncpy (current->text[i], line, len); current->text[i][len]='\0'; | |
| 415 ++i; | |
| 416 } else { | |
| 417 break; | |
| 418 } | |
| 419 } | |
| 420 current->lines=i; | |
| 421 } | |
| 422 return current; | |
| 423 } | |
| 424 | |
| 425 | |
| 818 | 426 subtitle *sub_read_line_vplayer(FILE *fd,subtitle *current) { |
| 2912 | 427 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
|
428 int a1,a2,a3; |
| 3735 | 429 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
|
430 int i,len,plen; |
| 818 | 431 |
| 432 while (!current->text[0]) { | |
| 2912 | 433 if (!fgets (line, LINE_LEN, fd)) return NULL; |
|
3724
a2325883c46c
vplayer format - no longer crashes on slightly broken subs.
eyck
parents:
3701
diff
changeset
|
434 if ((len=sscanf (line, "%d:%d:%d%c%n",&a1,&a2,&a3,&separator,&plen)) < 4) |
| 818 | 435 continue; |
|
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
436 |
|
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
437 if (!(current->start = a1*360000+a2*6000+a3*100)) |
| 818 | 438 continue; |
|
5363
1f068f4bb6e7
vplayer sub fix by Arkadiusz Podgorski <wodzu@softomat.com.pl>
arpi
parents:
4886
diff
changeset
|
439 /* removed by wodzu |
|
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
440 p=line; |
|
1640
cbedcfab877b
Fixup to vplayer subtitle submitted to sourceforge by Igor Wojnicki
eyck
parents:
1501
diff
changeset
|
441 // finds the body of the subtitle |
|
cbedcfab877b
Fixup to vplayer subtitle submitted to sourceforge by Igor Wojnicki
eyck
parents:
1501
diff
changeset
|
442 for (i=0; i<3; i++){ |
| 3433 | 443 p=strchr(p,':'); |
| 444 if (p==NULL) break; | |
| 445 ++p; | |
| 446 } | |
| 447 if (p==NULL) { | |
| 448 printf("SUB: Skipping incorrect subtitle line!\n"); | |
| 449 continue; | |
| 450 } | |
|
5363
1f068f4bb6e7
vplayer sub fix by Arkadiusz Podgorski <wodzu@softomat.com.pl>
arpi
parents:
4886
diff
changeset
|
451 */ |
|
1f068f4bb6e7
vplayer sub fix by Arkadiusz Podgorski <wodzu@softomat.com.pl>
arpi
parents:
4886
diff
changeset
|
452 // 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
|
453 // 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
|
454 // colon! look, what simple it can be: |
|
1f068f4bb6e7
vplayer sub fix by Arkadiusz Podgorski <wodzu@softomat.com.pl>
arpi
parents:
4886
diff
changeset
|
455 p = &line[ plen ]; |
|
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
456 |
|
1640
cbedcfab877b
Fixup to vplayer subtitle submitted to sourceforge by Igor Wojnicki
eyck
parents:
1501
diff
changeset
|
457 i=0; |
| 818 | 458 if (*p!='|') { |
| 459 // | |
| 460 next = p,i=0; | |
| 461 while ((next =sub_readtext (next, &(current->text[i])))) { | |
| 462 if (current->text[i]==ERR) {return ERR;} | |
| 463 i++; | |
| 6296 | 464 if (i>=SUB_MAX_TEXT) { mp_msg(MSGT_SUBREADER,MSGL_WARN,"Too many lines in a subtitle\n");current->lines=i;return current;} |
| 818 | 465 } |
| 466 current->lines=i+1; | |
| 467 } | |
| 468 } | |
| 469 return current; | |
| 470 } | |
| 471 | |
| 850 | 472 subtitle *sub_read_line_rt(FILE *fd,subtitle *current) { |
| 473 //TODO: This format uses quite rich (sub/super)set of xhtml | |
| 474 // I couldn't check it since DTD is not included. | |
| 475 // WARNING: full XML parses can be required for proper parsing | |
| 2912 | 476 char line[LINE_LEN+1]; |
| 850 | 477 int a1,a2,a3,a4,b1,b2,b3,b4; |
| 478 char *p=NULL,*next=NULL; | |
| 479 int i,len,plen; | |
| 480 | |
| 481 while (!current->text[0]) { | |
| 2912 | 482 if (!fgets (line, LINE_LEN, fd)) return NULL; |
| 850 | 483 //TODO: it seems that format of time is not easily determined, it may be 1:12, 1:12.0 or 0:1:12.0 |
| 484 //to describe the same moment in time. Maybe there are even more formats in use. | |
| 485 //if ((len=sscanf (line, "<Time Begin=\"%d:%d:%d.%d\" End=\"%d:%d:%d.%d\"",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4)) < 8) | |
| 486 plen=a1=a2=a3=a4=b1=b2=b3=b4=0; | |
| 487 if ( | |
| 9322 | 488 ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d.%d\" %*[Ee]nd=\"%d.%d\"%*[^<]<clear/>%n",&a3,&a4,&b3,&b4,&plen)) < 4) && |
| 489 ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d.%d\" %*[Ee]nd=\"%d:%d.%d\"%*[^<]<clear/>%n",&a3,&a4,&b2,&b3,&b4,&plen)) < 5) && | |
| 850 | 490 ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d\" %*[Ee]nd=\"%d:%d\"%*[^<]<clear/>%n",&a2,&a3,&b2,&b3,&plen)) < 4) && |
| 491 ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d\" %*[Ee]nd=\"%d:%d.%d\"%*[^<]<clear/>%n",&a2,&a3,&b2,&b3,&b4,&plen)) < 5) && | |
| 492 // ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d.%d\" %*[Ee]nd=\"%d:%d\"%*[^<]<clear/>%n",&a2,&a3,&a4,&b2,&b3,&plen)) < 5) && | |
| 493 ((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) && | |
| 9322 | 494 ((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) && |
| 495 //now try it without end time | |
| 496 ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d.%d\"%*[^<]<clear/>%n",&a3,&a4,&plen)) < 2) && | |
| 497 ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d\"%*[^<]<clear/>%n",&a2,&a3,&plen)) < 2) && | |
| 498 ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d.%d\"%*[^<]<clear/>%n",&a2,&a3,&a4,&plen)) < 3) && | |
| 499 ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d:%d.%d\"%*[^<]<clear/>%n",&a1,&a2,&a3,&a4,&plen)) < 4) | |
| 850 | 500 ) |
| 501 continue; | |
| 502 current->start = a1*360000+a2*6000+a3*100+a4/10; | |
| 503 current->end = b1*360000+b2*6000+b3*100+b4/10; | |
| 9322 | 504 if (b1 == 0 && b2 == 0 && b3 == 0 && b4 == 0) |
| 505 current->end = current->start+200; | |
| 850 | 506 p=line; p+=plen;i=0; |
| 507 // 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
|
508 next = strstr(line,"<clear/>"); |
|
9c8c3b5e6658
possible sig11 fixed in .rt parser (weisskreuzova.zip)
arpi
parents:
6208
diff
changeset
|
509 if(next && strlen(next)>8){ |
|
9c8c3b5e6658
possible sig11 fixed in .rt parser (weisskreuzova.zip)
arpi
parents:
6208
diff
changeset
|
510 next+=8;i=0; |
|
9c8c3b5e6658
possible sig11 fixed in .rt parser (weisskreuzova.zip)
arpi
parents:
6208
diff
changeset
|
511 while ((next =sub_readtext (next, &(current->text[i])))) { |
| 850 | 512 if (current->text[i]==ERR) {return ERR;} |
| 513 i++; | |
| 6296 | 514 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
|
515 } |
| 850 | 516 } |
| 517 current->lines=i+1; | |
| 518 } | |
| 519 return current; | |
| 520 } | |
| 521 | |
| 921 | 522 subtitle *sub_read_line_ssa(FILE *fd,subtitle *current) { |
| 6597 | 523 /* |
| 524 * Sub Station Alpha v4 (and v2?) scripts have 9 commas before subtitle | |
| 525 * other Sub Station Alpha scripts have only 8 commas before subtitle | |
| 526 * Reading the "ScriptType:" field is not reliable since many scripts appear | |
| 527 * w/o it | |
| 528 * | |
| 529 * http://www.scriptclub.org is a good place to find more examples | |
| 530 * http://www.eswat.demon.co.uk is where the SSA specs can be found | |
| 531 */ | |
| 532 int comma; | |
| 533 static int max_comma = 32; /* let's use 32 for the case that the */ | |
| 534 /* amount of commas increase with newer SSA versions */ | |
| 535 | |
| 921 | 536 int hour1, min1, sec1, hunsec1, |
| 537 hour2, min2, sec2, hunsec2, nothing; | |
| 2141 | 538 int num; |
| 921 | 539 |
| 2912 | 540 char line[LINE_LEN+1], |
| 541 line3[LINE_LEN+1], | |
|
9009
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
542 *line2; |
| 2141 | 543 char *tmp; |
| 544 | |
| 921 | 545 do { |
| 2912 | 546 if (!fgets (line, LINE_LEN, fd)) return NULL; |
| 921 | 547 } while (sscanf (line, "Dialogue: Marked=%d,%d:%d:%d.%d,%d:%d:%d.%d," |
| 2140 | 548 "%[^\n\r]", ¬hing, |
| 549 &hour1, &min1, &sec1, &hunsec1, | |
| 550 &hour2, &min2, &sec2, &hunsec2, | |
| 10450 | 551 line3) < 9 |
| 552 && | |
| 553 sscanf (line, "Dialogue: %d,%d:%d:%d.%d,%d:%d:%d.%d," | |
| 554 "%[^\n\r]", ¬hing, | |
| 555 &hour1, &min1, &sec1, &hunsec1, | |
| 556 &hour2, &min2, &sec2, &hunsec2, | |
| 557 line3) < 9 ); | |
| 6597 | 558 |
| 559 line2=strchr(line3, ','); | |
| 560 | |
| 561 for (comma = 4; comma < max_comma; comma ++) | |
| 562 { | |
| 563 tmp = line2; | |
| 564 if(!(tmp=strchr(++tmp, ','))) break; | |
| 565 if(*(++tmp) == ' ') break; | |
| 566 /* a space after a comma means we're already in a sentence */ | |
| 567 line2 = tmp; | |
| 568 } | |
| 569 | |
| 570 if(comma < max_comma)max_comma = comma; | |
|
8602
36d5c7137876
Attached is a small patch to fix a couple of problems I found when using
arpi
parents:
8363
diff
changeset
|
571 /* eliminate the trailing comma */ |
|
36d5c7137876
Attached is a small patch to fix a couple of problems I found when using
arpi
parents:
8363
diff
changeset
|
572 if(*line2 == ',') line2++; |
| 2140 | 573 |
|
6247
0b8660d79efe
sub_read_line_ssa sig11 fix by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
arpi
parents:
6242
diff
changeset
|
574 current->lines=0;num=0; |
| 921 | 575 current->start = 360000*hour1 + 6000*min1 + 100*sec1 + hunsec1; |
| 576 current->end = 360000*hour2 + 6000*min2 + 100*sec2 + hunsec2; | |
| 2141 | 577 |
|
5990
e5b3385775b3
accept \N too, patch by Reinder <r.cuperus@student.utwente.nl>
arpi
parents:
5828
diff
changeset
|
578 while (((tmp=strstr(line2, "\\n")) != NULL) || ((tmp=strstr(line2, "\\N")) != NULL) ){ |
| 2141 | 579 current->text[num]=(char *)malloc(tmp-line2+1); |
| 580 strncpy (current->text[num], line2, tmp-line2); | |
| 581 current->text[num][tmp-line2]='\0'; | |
| 582 line2=tmp+2; | |
| 583 num++; | |
| 584 current->lines++; | |
| 585 if (current->lines >= SUB_MAX_TEXT) return current; | |
| 586 } | |
| 587 | |
| 3701 | 588 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
|
589 current->lines++; |
| 818 | 590 |
| 921 | 591 return current; |
| 592 } | |
| 258 | 593 |
|
9009
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
594 void sub_pp_ssa(subtitle *sub) { |
|
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
595 int l=sub->lines; |
|
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
596 char *so,*de,*start; |
|
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
597 |
|
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
598 while (l){ |
|
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
599 /* eliminate any text enclosed with {}, they are font and color settings */ |
|
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
600 so=de=sub->text[--l]; |
|
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
601 while (*so) { |
|
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
602 if(*so == '{' && so[1]=='\\') { |
|
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
603 for (start=so; *so && *so!='}'; so++); |
|
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
604 if(*so) so++; else so=start; |
|
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
605 } |
|
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
606 if(*so) { |
|
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
607 *de=*so; |
|
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
608 so++; de++; |
|
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
609 } |
|
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
610 } |
|
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
611 *de=*so; |
|
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
612 } |
|
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
613 } |
|
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
614 |
| 11873 | 615 /* |
| 616 * PJS subtitles reader. | |
| 617 * That's the "Phoenix Japanimation Society" format. | |
| 618 * I found some of them in http://www.scriptsclub.org/ (used for anime). | |
| 619 * The time is in tenths of second. | |
| 620 * | |
| 621 * by set, based on code by szabi (dunnowhat sub format ;-) | |
| 622 */ | |
| 623 subtitle *sub_read_line_pjs(FILE *fd,subtitle *current) { | |
| 2912 | 624 char line[LINE_LEN+1]; |
| 11873 | 625 char text[LINE_LEN+1], *s, *d; |
| 1081 | 626 |
| 2912 | 627 if (!fgets (line, LINE_LEN, fd)) |
| 1081 | 628 return NULL; |
| 11873 | 629 /* skip spaces */ |
| 630 for (s=line; *s && isspace(*s); s++); | |
| 631 /* allow empty lines at the end of the file */ | |
| 632 if (*s==0) | |
| 633 return NULL; | |
| 634 /* get the time */ | |
| 635 if (sscanf (s, "%ld,%ld,", &(current->start), | |
| 636 &(current->end)) <2) { | |
| 1081 | 637 return ERR; |
| 11873 | 638 } |
| 639 /* the files I have are in tenths of second */ | |
| 640 current->start *= 10; | |
| 641 current->end *= 10; | |
| 642 /* walk to the beggining of the string */ | |
| 643 for (; *s; s++) if (*s==',') break; | |
| 644 if (*s) { | |
| 645 for (s++; *s; s++) if (*s==',') break; | |
| 646 if (*s) s++; | |
| 647 } | |
| 648 if (*s!='"') { | |
| 649 return ERR; | |
| 650 } | |
| 651 /* copy the string to the text buffer */ | |
| 652 for (s++, d=text; *s && *s!='"'; s++, d++) | |
| 653 *d=*s; | |
| 654 *d=0; | |
| 1081 | 655 current->text[0] = strdup(text); |
| 656 current->lines = 1; | |
| 657 | |
| 658 return current; | |
| 659 } | |
| 660 | |
| 2177 | 661 subtitle *sub_read_line_mpsub(FILE *fd, subtitle *current) { |
| 2912 | 662 char line[LINE_LEN+1]; |
| 2178 | 663 float a,b; |
| 664 int num=0; | |
| 2177 | 665 char *p, *q; |
| 666 | |
| 667 do | |
| 668 { | |
| 2912 | 669 if (!fgets(line, LINE_LEN, fd)) return NULL; |
| 2178 | 670 } while (sscanf (line, "%f %f", &a, &b) !=2); |
| 2177 | 671 |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
672 mpsub_position += a*mpsub_multiplier; |
| 2178 | 673 current->start=(int) mpsub_position; |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
674 mpsub_position += b*mpsub_multiplier; |
| 2178 | 675 current->end=(int) mpsub_position; |
| 2177 | 676 |
| 677 while (num < SUB_MAX_TEXT) { | |
| 4098 | 678 if (!fgets (line, LINE_LEN, fd)) { |
| 679 if (num == 0) return NULL; | |
| 680 else return current; | |
| 681 } | |
| 2177 | 682 p=line; |
| 683 while (isspace(*p)) p++; | |
| 684 if (eol(*p) && num > 0) return current; | |
| 685 if (eol(*p)) return NULL; | |
| 686 | |
| 687 for (q=p; !eol(*q); q++); | |
| 688 *q='\0'; | |
| 689 if (strlen(p)) { | |
| 690 current->text[num]=strdup(p); | |
| 4098 | 691 // printf (">%s<\n",p); |
| 2177 | 692 current->lines = ++num; |
| 693 } else { | |
| 694 if (num) return current; | |
| 695 else return NULL; | |
| 696 } | |
| 697 } | |
| 3735 | 698 return NULL; // we should have returned before if it's OK |
| 2177 | 699 } |
| 700 | |
|
8362
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
701 #ifndef USE_SORTSUB |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
702 //we don't need this if we use previous_sub_end |
| 2343 | 703 subtitle *previous_aqt_sub = NULL; |
|
8362
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
704 #endif |
| 2343 | 705 |
| 706 subtitle *sub_read_line_aqt(FILE *fd,subtitle *current) { | |
| 2912 | 707 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
|
708 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
|
709 int i; |
| 2343 | 710 |
| 711 while (1) { | |
| 712 // try to locate next subtitle | |
| 2912 | 713 if (!fgets (line, LINE_LEN, fd)) |
| 2343 | 714 return NULL; |
| 715 if (!(sscanf (line, "-->> %ld", &(current->start)) <1)) | |
| 716 break; | |
| 717 } | |
| 718 | |
|
8362
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
719 #ifdef USE_SORTSUB |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
720 previous_sub_end = (current->start) ? current->start - 1 : 0; |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
721 #else |
| 2343 | 722 if (previous_aqt_sub != NULL) |
| 723 previous_aqt_sub->end = current->start-1; | |
| 724 | |
| 725 previous_aqt_sub = current; | |
|
8362
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
726 #endif |
| 2343 | 727 |
| 2912 | 728 if (!fgets (line, LINE_LEN, fd)) |
| 2343 | 729 return NULL; |
| 730 | |
| 2468 | 731 sub_readtext((char *) &line,¤t->text[0]); |
| 2343 | 732 current->lines = 1; |
| 733 current->end = current->start; // will be corrected by next subtitle | |
| 734 | |
| 2912 | 735 if (!fgets (line, LINE_LEN, fd)) |
|
8862
356534b9e7d4
Since version 2.7 the file extension for JACOsub changed from
arpi
parents:
8789
diff
changeset
|
736 return current; |
| 2343 | 737 |
|
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
|
738 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
|
739 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
|
740 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
|
741 i++; |
| 6296 | 742 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
|
743 } |
|
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
|
744 current->lines=i+1; |
| 2343 | 745 |
| 746 if ((current->text[0]=="") && (current->text[1]=="")) { | |
|
8362
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
747 #ifdef USE_SORTSUB |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
748 previous_sub_end = 0; |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
749 #else |
| 2343 | 750 // void subtitle -> end of previous marked and exit |
| 751 previous_aqt_sub = NULL; | |
|
8362
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
752 #endif |
| 2343 | 753 return NULL; |
| 754 } | |
| 755 | |
| 756 return current; | |
| 757 } | |
| 2177 | 758 |
|
8362
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
759 #ifndef USE_SORTSUB |
|
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
|
760 subtitle *previous_subrip09_sub = NULL; |
|
8362
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
761 #endif |
|
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
|
762 |
|
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
|
763 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
|
764 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
|
765 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
|
766 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
|
767 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
|
768 |
|
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
|
769 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
|
770 // 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
|
771 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
|
772 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
|
773 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
|
774 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
|
775 } |
|
8362
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
776 |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
777 current->start = a1*360000+a2*6000+a3*100; |
|
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
|
778 |
|
8362
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
779 #ifdef USE_SORTSUB |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
780 previous_sub_end = (current->start) ? current->start - 1 : 0; |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
781 #else |
|
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
|
782 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
|
783 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
|
784 |
|
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
|
785 previous_subrip09_sub = current; |
|
8362
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
786 #endif |
|
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
|
787 |
|
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
|
788 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
|
789 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
|
790 |
|
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
|
791 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
|
792 |
|
7472
c4434bdf6e51
tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
arpi
parents:
7460
diff
changeset
|
793 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
|
794 |
|
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
|
795 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
|
796 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
|
797 i++; |
| 6296 | 798 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
|
799 } |
|
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
|
800 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
|
801 |
|
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
|
802 if ((current->text[0]=="") && (i==0)) { |
|
8362
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
803 #ifdef USE_SORTSUB |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
804 previous_sub_end = 0; |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
805 #else |
|
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
|
806 // 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
|
807 previous_subrip09_sub = NULL; |
|
8362
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
808 #endif |
|
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
|
809 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
|
810 } |
|
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
|
811 |
|
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
|
812 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
|
813 } |
|
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
|
814 |
|
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
815 subtitle *sub_read_line_jacosub(FILE * fd, subtitle * current) |
|
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
816 { |
|
8207
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
817 char line1[LINE_LEN], line2[LINE_LEN], directive[LINE_LEN], *p, *q; |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
818 unsigned a1, a2, a3, a4, b1, b2, b3, b4, comment = 0; |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
819 static unsigned jacoTimeres = 30; |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
820 static int jacoShift = 0; |
|
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
821 |
|
14642
38572280e8e7
bzero is deprecated patch by Gianluigi Tiesi <mplayer at netfarm.it>
faust3
parents:
13680
diff
changeset
|
822 memset(current, 0, sizeof(subtitle)); |
|
38572280e8e7
bzero is deprecated patch by Gianluigi Tiesi <mplayer at netfarm.it>
faust3
parents:
13680
diff
changeset
|
823 memset(line1, 0, LINE_LEN); |
|
38572280e8e7
bzero is deprecated patch by Gianluigi Tiesi <mplayer at netfarm.it>
faust3
parents:
13680
diff
changeset
|
824 memset(line2, 0, LINE_LEN); |
|
38572280e8e7
bzero is deprecated patch by Gianluigi Tiesi <mplayer at netfarm.it>
faust3
parents:
13680
diff
changeset
|
825 memset(directive, 0, LINE_LEN); |
|
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
826 while (!current->text[0]) { |
|
8207
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
827 if (!fgets(line1, LINE_LEN, fd)) { |
|
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
828 return NULL; |
|
8207
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
829 } |
|
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
830 if (sscanf |
|
8207
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
831 (line1, "%u:%u:%u.%u %u:%u:%u.%u %[^\n\r]", &a1, &a2, &a3, &a4, |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
832 &b1, &b2, &b3, &b4, line2) < 9) { |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
833 if (sscanf(line1, "@%u @%u %[^\n\r]", &a4, &b4, line2) < 3) { |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
834 if (line1[0] == '#') { |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
835 int hours = 0, minutes = 0, seconds, delta, inverter = |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
836 1; |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
837 unsigned units = jacoShift; |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
838 switch (toupper(line1[1])) { |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
839 case 'S': |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
840 if (isalpha(line1[2])) { |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
841 delta = 6; |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
842 } else { |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
843 delta = 2; |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
844 } |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
845 if (sscanf(&line1[delta], "%d", &hours)) { |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
846 if (hours < 0) { |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
847 hours *= -1; |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
848 inverter = -1; |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
849 } |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
850 if (sscanf(&line1[delta], "%*d:%d", &minutes)) { |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
851 if (sscanf |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
852 (&line1[delta], "%*d:%*d:%d", |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
853 &seconds)) { |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
854 sscanf(&line1[delta], "%*d:%*d:%*d.%d", |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
855 &units); |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
856 } else { |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
857 hours = 0; |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
858 sscanf(&line1[delta], "%d:%d.%d", |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
859 &minutes, &seconds, &units); |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
860 minutes *= inverter; |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
861 } |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
862 } else { |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
863 hours = minutes = 0; |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
864 sscanf(&line1[delta], "%d.%d", &seconds, |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
865 &units); |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
866 seconds *= inverter; |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
867 } |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
868 jacoShift = |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
869 ((hours * 3600 + minutes * 60 + |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
870 seconds) * jacoTimeres + |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
871 units) * inverter; |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
872 } |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
873 break; |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
874 case 'T': |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
875 if (isalpha(line1[2])) { |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
876 delta = 8; |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
877 } else { |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
878 delta = 2; |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
879 } |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
880 sscanf(&line1[delta], "%u", &jacoTimeres); |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
881 break; |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
882 } |
|
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
883 } |
|
8207
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
884 continue; |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
885 } else { |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
886 current->start = |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
887 (unsigned long) ((a4 + jacoShift) * 100.0 / |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
888 jacoTimeres); |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
889 current->end = |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
890 (unsigned long) ((b4 + jacoShift) * 100.0 / |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
891 jacoTimeres); |
|
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
892 } |
|
8207
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
893 } else { |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
894 current->start = |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
895 (unsigned |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
896 long) (((a1 * 3600 + a2 * 60 + a3) * jacoTimeres + a4 + |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
897 jacoShift) * 100.0 / jacoTimeres); |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
898 current->end = |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
899 (unsigned |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
900 long) (((b1 * 3600 + b2 * 60 + b3) * jacoTimeres + b4 + |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
901 jacoShift) * 100.0 / jacoTimeres); |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
902 } |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
903 current->lines = 0; |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
904 p = line2; |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
905 while ((*p == ' ') || (*p == '\t')) { |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
906 ++p; |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
907 } |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
908 if (isalpha(*p)||*p == '[') { |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
909 int cont, jLength; |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
910 |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
911 if (sscanf(p, "%s %[^\n\r]", directive, line1) < 2) |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
912 return (subtitle *) ERR; |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
913 jLength = strlen(directive); |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
914 for (cont = 0; cont < jLength; ++cont) { |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
915 if (isalpha(*(directive + cont))) |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
916 *(directive + cont) = toupper(*(directive + cont)); |
|
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
917 } |
|
8207
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
918 if ((strstr(directive, "RDB") != NULL) |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
919 || (strstr(directive, "RDC") != NULL) |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
920 || (strstr(directive, "RLB") != NULL) |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
921 || (strstr(directive, "RLG") != NULL)) { |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
922 continue; |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
923 } |
|
10916
c36db88bfbc4
Subtitle alignment & smart splitting by Salvatore Falco
henry
parents:
10801
diff
changeset
|
924 if (strstr(directive, "JL") != NULL) { |
|
13343
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
925 current->alignment = SUB_ALIGNMENT_BOTTOMLEFT; |
|
10916
c36db88bfbc4
Subtitle alignment & smart splitting by Salvatore Falco
henry
parents:
10801
diff
changeset
|
926 } else if (strstr(directive, "JR") != NULL) { |
|
13343
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
927 current->alignment = SUB_ALIGNMENT_BOTTOMRIGHT; |
|
10916
c36db88bfbc4
Subtitle alignment & smart splitting by Salvatore Falco
henry
parents:
10801
diff
changeset
|
928 } else { |
|
13343
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
929 current->alignment = SUB_ALIGNMENT_BOTTOMCENTER; |
|
10916
c36db88bfbc4
Subtitle alignment & smart splitting by Salvatore Falco
henry
parents:
10801
diff
changeset
|
930 } |
|
8207
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
931 strcpy(line2, line1); |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
932 p = line2; |
|
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
933 } |
|
10916
c36db88bfbc4
Subtitle alignment & smart splitting by Salvatore Falco
henry
parents:
10801
diff
changeset
|
934 for (q = line1; (!eol(*p)) && (current->lines < SUB_MAX_TEXT); ++p) { |
|
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
935 switch (*p) { |
|
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
936 case '{': |
|
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
937 comment++; |
|
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
938 break; |
|
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
939 case '}': |
|
8207
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
940 if (comment) { |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
941 --comment; |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
942 //the next line to get rid of a blank after the comment |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
943 if ((*(p + 1)) == ' ') |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
944 p++; |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
945 } |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
946 break; |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
947 case '~': |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
948 if (!comment) { |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
949 *q = ' '; |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
950 ++q; |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
951 } |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
952 break; |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
953 case ' ': |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
954 case '\t': |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
955 if ((*(p + 1) == ' ') || (*(p + 1) == '\t')) |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
956 break; |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
957 if (!comment) { |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
958 *q = ' '; |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
959 ++q; |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
960 } |
|
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
961 break; |
|
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
962 case '\\': |
|
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
963 if (*(p + 1) == 'n') { |
|
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
964 *q = '\0'; |
|
8207
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
965 q = line1; |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
966 current->text[current->lines++] = strdup(line1); |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
967 ++p; |
|
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
968 break; |
|
8207
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
969 } |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
970 if ((toupper(*(p + 1)) == 'C') |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
971 || (toupper(*(p + 1)) == 'F')) { |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
972 ++p,++p; |
|
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
973 break; |
|
8207
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
974 } |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
975 if ((*(p + 1) == 'B') || (*(p + 1) == 'b') || (*(p + 1) == 'D') || //actually this means "insert current date here" |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
976 (*(p + 1) == 'I') || (*(p + 1) == 'i') || (*(p + 1) == 'N') || (*(p + 1) == 'T') || //actually this means "insert current time here" |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
977 (*(p + 1) == 'U') || (*(p + 1) == 'u')) { |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
978 ++p; |
|
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
979 break; |
|
8207
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
980 } |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
981 if ((*(p + 1) == '\\') || |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
982 (*(p + 1) == '~') || (*(p + 1) == '{')) { |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
983 ++p; |
|
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
984 } else if (eol(*(p + 1))) { |
|
8207
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
985 if (!fgets(directive, LINE_LEN, fd)) |
|
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
986 return NULL; |
|
8207
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
987 trail_space(directive); |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
988 strncat(line2, directive, |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
989 (LINE_LEN > 511) ? LINE_LEN : 511); |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
990 break; |
|
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
991 } |
|
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
992 default: |
|
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
993 if (!comment) { |
|
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
994 *q = *p; |
|
8207
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
995 ++q; |
|
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
996 } |
|
8207
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
997 } //-- switch |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
998 } //-- for |
|
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
999 *q = '\0'; |
|
8207
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
1000 current->text[current->lines] = strdup(line1); |
|
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
1001 } //-- while |
|
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
1002 current->lines++; |
|
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
1003 return current; |
|
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
1004 } |
|
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
|
1005 |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1006 int sub_autodetect (FILE *fd, int *uses_time) { |
| 2912 | 1007 char line[LINE_LEN+1]; |
| 258 | 1008 int i,j=0; |
| 2177 | 1009 char p; |
| 258 | 1010 |
| 624 | 1011 while (j < 100) { |
| 258 | 1012 j++; |
| 2912 | 1013 if (!fgets (line, LINE_LEN, fd)) |
| 1014 return SUB_INVALID; | |
| 258 | 1015 |
| 624 | 1016 if (sscanf (line, "{%d}{%d}", &i, &i)==2) |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1017 {*uses_time=0;return SUB_MICRODVD;} |
| 4519 | 1018 if (sscanf (line, "{%d}{}", &i)==1) |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1019 {*uses_time=0;return SUB_MICRODVD;} |
|
12138
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
1020 if (sscanf (line, "[%d][%d]", &i, &i)==2) |
|
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
1021 {*uses_time=1;return SUB_MPL2;} |
| 269 | 1022 if (sscanf (line, "%d:%d:%d.%d,%d:%d:%d.%d", &i, &i, &i, &i, &i, &i, &i, &i)==8) |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1023 {*uses_time=1;return SUB_SUBRIP;} |
|
9217
420e2b2f8e5a
compiler warning fixes patch by Dominik Mierzejewski <dominik@rangers.eu.org>
arpi
parents:
9145
diff
changeset
|
1024 if (sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d", &i, &i, &i, (char *)&i, &i, &i, &i, &i, (char *)&i, &i)==10) |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1025 {*uses_time=1;return SUB_SUBVIEWER;} |
| 11496 | 1026 if (sscanf (line, "{T %d:%d:%d:%d",&i, &i, &i, &i)==4) |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1027 {*uses_time=1;return SUB_SUBVIEWER2;} |
| 624 | 1028 if (strstr (line, "<SAMI>")) |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1029 {*uses_time=1; return SUB_SAMI;} |
|
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
1030 if (sscanf(line, "%d:%d:%d.%d %d:%d:%d.%d", &i, &i, &i, &i, &i, &i, &i, &i) == 8) |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1031 {*uses_time = 1; return SUB_JACOSUB;} |
|
8207
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
1032 if (sscanf(line, "@%d @%d", &i, &i) == 2) |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1033 {*uses_time = 1; return SUB_JACOSUB;} |
| 818 | 1034 if (sscanf (line, "%d:%d:%d:", &i, &i, &i )==3) |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1035 {*uses_time=1;return SUB_VPLAYER;} |
|
5363
1f068f4bb6e7
vplayer sub fix by Arkadiusz Podgorski <wodzu@softomat.com.pl>
arpi
parents:
4886
diff
changeset
|
1036 if (sscanf (line, "%d:%d:%d ", &i, &i, &i )==3) |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1037 {*uses_time=1;return SUB_VPLAYER;} |
| 850 | 1038 //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
|
1039 // too weak test for RT |
|
18c43d261c35
corrected strcmp() bug, now it works again with every subs (it was broken)
laaz
parents:
896
diff
changeset
|
1040 // Please someone who knows the format of RT... FIX IT!!! |
| 921 | 1041 // 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
|
1042 if ( *line == '<' ) |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1043 {*uses_time=1;return SUB_RT;} |
| 921 | 1044 |
| 1045 if (!memcmp(line, "Dialogue: Marked", 16)) | |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1046 {*uses_time=1; return SUB_SSA;} |
| 10450 | 1047 if (!memcmp(line, "Dialogue: ", 10)) |
| 1048 {*uses_time=1; return SUB_SSA;} | |
| 1081 | 1049 if (sscanf (line, "%d,%d,\"%c", &i, &i, (char *) &i) == 3) |
| 11873 | 1050 {*uses_time=1;return SUB_PJS;} |
| 2177 | 1051 if (sscanf (line, "FORMAT=%d", &i) == 1) |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1052 {*uses_time=0; return SUB_MPSUB;} |
| 2177 | 1053 if (sscanf (line, "FORMAT=TIM%c", &p)==1 && p=='E') |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1054 {*uses_time=1; return SUB_MPSUB;} |
| 2343 | 1055 if (strstr (line, "-->>")) |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1056 {*uses_time=0; return SUB_AQTITLE;} |
|
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
|
1057 if (sscanf (line, "[%d:%d:%d]", &i, &i, &i)==3) |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1058 {*uses_time=1;return SUB_SUBRIP09;} |
| 258 | 1059 } |
| 624 | 1060 |
| 2912 | 1061 return SUB_INVALID; // too many bad lines |
| 258 | 1062 } |
|
2449
7ef89d9b06ed
added DUMPSUBS recognition if we need compile only subreader.c alone
atlka
parents:
2358
diff
changeset
|
1063 |
|
7ef89d9b06ed
added DUMPSUBS recognition if we need compile only subreader.c alone
atlka
parents:
2358
diff
changeset
|
1064 #ifdef DUMPSUBS |
|
7ef89d9b06ed
added DUMPSUBS recognition if we need compile only subreader.c alone
atlka
parents:
2358
diff
changeset
|
1065 int sub_utf8=0; |
|
7ef89d9b06ed
added DUMPSUBS recognition if we need compile only subreader.c alone
atlka
parents:
2358
diff
changeset
|
1066 #else |
|
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1067 extern int sub_utf8; |
| 9056 | 1068 int sub_utf8_prev=0; |
|
2449
7ef89d9b06ed
added DUMPSUBS recognition if we need compile only subreader.c alone
atlka
parents:
2358
diff
changeset
|
1069 #endif |
| 258 | 1070 |
| 4886 | 1071 extern float sub_delay; |
| 1072 extern float sub_fps; | |
| 1073 | |
|
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1074 #ifdef USE_ICONV |
| 10354 | 1075 static iconv_t icdsc = (iconv_t)(-1); |
|
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1076 |
|
12909
dc8eba991005
fixes a crash and unchecked string-handling in ENCA code.
reimar
parents:
12646
diff
changeset
|
1077 void subcp_open (FILE *enca_fd) |
|
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1078 { |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1079 char *tocp = "UTF-8"; |
| 9056 | 1080 |
|
12909
dc8eba991005
fixes a crash and unchecked string-handling in ENCA code.
reimar
parents:
12646
diff
changeset
|
1081 if (sub_cp){ |
|
dc8eba991005
fixes a crash and unchecked string-handling in ENCA code.
reimar
parents:
12646
diff
changeset
|
1082 char *cp_tmp = sub_cp; |
|
dc8eba991005
fixes a crash and unchecked string-handling in ENCA code.
reimar
parents:
12646
diff
changeset
|
1083 #ifdef HAVE_ENCA |
|
dc8eba991005
fixes a crash and unchecked string-handling in ENCA code.
reimar
parents:
12646
diff
changeset
|
1084 char enca_lang[3], enca_fallback[100]; |
|
dc8eba991005
fixes a crash and unchecked string-handling in ENCA code.
reimar
parents:
12646
diff
changeset
|
1085 int free_cp_tmp = 0; |
|
dc8eba991005
fixes a crash and unchecked string-handling in ENCA code.
reimar
parents:
12646
diff
changeset
|
1086 if (sscanf(sub_cp, "enca:%2s:%99s", enca_lang, enca_fallback) == 2 |
|
dc8eba991005
fixes a crash and unchecked string-handling in ENCA code.
reimar
parents:
12646
diff
changeset
|
1087 || sscanf(sub_cp, "ENCA:%2s:%99s", enca_lang, enca_fallback) == 2) { |
|
dc8eba991005
fixes a crash and unchecked string-handling in ENCA code.
reimar
parents:
12646
diff
changeset
|
1088 if (enca_fd) { |
|
dc8eba991005
fixes a crash and unchecked string-handling in ENCA code.
reimar
parents:
12646
diff
changeset
|
1089 cp_tmp = guess_cp(enca_fd, enca_lang, enca_fallback); |
|
dc8eba991005
fixes a crash and unchecked string-handling in ENCA code.
reimar
parents:
12646
diff
changeset
|
1090 free_cp_tmp = 1; |
|
dc8eba991005
fixes a crash and unchecked string-handling in ENCA code.
reimar
parents:
12646
diff
changeset
|
1091 } else { |
|
dc8eba991005
fixes a crash and unchecked string-handling in ENCA code.
reimar
parents:
12646
diff
changeset
|
1092 cp_tmp = enca_fallback; |
|
dc8eba991005
fixes a crash and unchecked string-handling in ENCA code.
reimar
parents:
12646
diff
changeset
|
1093 } |
|
dc8eba991005
fixes a crash and unchecked string-handling in ENCA code.
reimar
parents:
12646
diff
changeset
|
1094 } |
|
dc8eba991005
fixes a crash and unchecked string-handling in ENCA code.
reimar
parents:
12646
diff
changeset
|
1095 #endif |
|
dc8eba991005
fixes a crash and unchecked string-handling in ENCA code.
reimar
parents:
12646
diff
changeset
|
1096 if ((icdsc = iconv_open (tocp, cp_tmp)) != (iconv_t)(-1)){ |
| 6296 | 1097 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
|
1098 sub_utf8 = 2; |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1099 } else |
| 6296 | 1100 mp_msg(MSGT_SUBREADER,MSGL_ERR,"SUB: error opening iconv descriptor.\n"); |
|
12909
dc8eba991005
fixes a crash and unchecked string-handling in ENCA code.
reimar
parents:
12646
diff
changeset
|
1101 #ifdef HAVE_ENCA |
|
dc8eba991005
fixes a crash and unchecked string-handling in ENCA code.
reimar
parents:
12646
diff
changeset
|
1102 if (free_cp_tmp && cp_tmp) free(cp_tmp); |
|
dc8eba991005
fixes a crash and unchecked string-handling in ENCA code.
reimar
parents:
12646
diff
changeset
|
1103 #endif |
|
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1104 } |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1105 } |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1106 |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1107 void subcp_close (void) |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1108 { |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1109 if (icdsc != (iconv_t)(-1)){ |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1110 (void) iconv_close (icdsc); |
| 9143 | 1111 icdsc = (iconv_t)(-1); |
| 6296 | 1112 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
|
1113 } |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1114 } |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1115 |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1116 #define ICBUFFSIZE 512 |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1117 static char icbuffer[ICBUFFSIZE]; |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1118 |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1119 subtitle* subcp_recode (subtitle *sub) |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1120 { |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1121 int l=sub->lines; |
|
7472
c4434bdf6e51
tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
arpi
parents:
7460
diff
changeset
|
1122 size_t ileft, oleft; |
|
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1123 char *op, *ip, *ot; |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1124 |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1125 while (l){ |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1126 op = icbuffer; |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1127 ip = sub->text[--l]; |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1128 ileft = strlen(ip); |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1129 oleft = ICBUFFSIZE - 1; |
| 9056 | 1130 |
|
6163
141a082e6da6
applied 64bit patch from Ulrich Hecht <uli at suse dot de>
alex
parents:
6076
diff
changeset
|
1131 if (iconv(icdsc, &ip, &ileft, |
|
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1132 &op, &oleft) == (size_t)(-1)) { |
| 9056 | 1133 mp_msg(MSGT_SUBREADER,MSGL_WARN,"SUB: error recoding line (1).\n"); |
|
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1134 l++; |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1135 break; |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1136 } |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1137 if (!(ot = (char *)malloc(op - icbuffer + 1))){ |
| 6296 | 1138 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
|
1139 l++; |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1140 break; |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1141 } |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1142 *op='\0' ; |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1143 strcpy (ot, icbuffer); |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1144 free (sub->text[l]); |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1145 sub->text[l] = ot; |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1146 } |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1147 if (l){ |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1148 for (l = sub->lines; l;) |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1149 free (sub->text[--l]); |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1150 return ERR; |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1151 } |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1152 return sub; |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1153 } |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1154 |
|
8618
a879b231b7e3
This patch adds a call to subcp_recode1(), so this subtitles too are
arpi
parents:
8602
diff
changeset
|
1155 // for demux_ogg.c: |
|
a879b231b7e3
This patch adds a call to subcp_recode1(), so this subtitles too are
arpi
parents:
8602
diff
changeset
|
1156 subtitle* subcp_recode1 (subtitle *sub) |
|
a879b231b7e3
This patch adds a call to subcp_recode1(), so this subtitles too are
arpi
parents:
8602
diff
changeset
|
1157 { |
|
a879b231b7e3
This patch adds a call to subcp_recode1(), so this subtitles too are
arpi
parents:
8602
diff
changeset
|
1158 int l=sub->lines; |
|
a879b231b7e3
This patch adds a call to subcp_recode1(), so this subtitles too are
arpi
parents:
8602
diff
changeset
|
1159 size_t ileft, oleft; |
| 9143 | 1160 |
| 1161 if(icdsc == (iconv_t)(-1)) return sub; | |
|
8618
a879b231b7e3
This patch adds a call to subcp_recode1(), so this subtitles too are
arpi
parents:
8602
diff
changeset
|
1162 |
|
a879b231b7e3
This patch adds a call to subcp_recode1(), so this subtitles too are
arpi
parents:
8602
diff
changeset
|
1163 while (l){ |
| 9143 | 1164 char *ip = icbuffer; |
| 1165 char *op = sub->text[--l]; | |
| 12646 | 1166 strlcpy(ip, op, ICBUFFSIZE); |
|
8618
a879b231b7e3
This patch adds a call to subcp_recode1(), so this subtitles too are
arpi
parents:
8602
diff
changeset
|
1167 ileft = strlen(ip); |
|
a879b231b7e3
This patch adds a call to subcp_recode1(), so this subtitles too are
arpi
parents:
8602
diff
changeset
|
1168 oleft = ICBUFFSIZE - 1; |
|
a879b231b7e3
This patch adds a call to subcp_recode1(), so this subtitles too are
arpi
parents:
8602
diff
changeset
|
1169 |
|
a879b231b7e3
This patch adds a call to subcp_recode1(), so this subtitles too are
arpi
parents:
8602
diff
changeset
|
1170 if (iconv(icdsc, &ip, &ileft, |
|
a879b231b7e3
This patch adds a call to subcp_recode1(), so this subtitles too are
arpi
parents:
8602
diff
changeset
|
1171 &op, &oleft) == (size_t)(-1)) { |
| 9143 | 1172 mp_msg(MSGT_SUBREADER,MSGL_V,"SUB: error recoding line (2).\n"); |
|
8618
a879b231b7e3
This patch adds a call to subcp_recode1(), so this subtitles too are
arpi
parents:
8602
diff
changeset
|
1173 return sub; |
|
a879b231b7e3
This patch adds a call to subcp_recode1(), so this subtitles too are
arpi
parents:
8602
diff
changeset
|
1174 } |
|
a879b231b7e3
This patch adds a call to subcp_recode1(), so this subtitles too are
arpi
parents:
8602
diff
changeset
|
1175 *op='\0' ; |
|
a879b231b7e3
This patch adds a call to subcp_recode1(), so this subtitles too are
arpi
parents:
8602
diff
changeset
|
1176 } |
|
a879b231b7e3
This patch adds a call to subcp_recode1(), so this subtitles too are
arpi
parents:
8602
diff
changeset
|
1177 return sub; |
|
a879b231b7e3
This patch adds a call to subcp_recode1(), so this subtitles too are
arpi
parents:
8602
diff
changeset
|
1178 } |
|
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1179 #endif |
| 258 | 1180 |
|
9635
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1181 #ifdef USE_FRIBIDI |
| 10555 | 1182 #ifndef max |
|
9635
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1183 #define max(a,b) (((a)>(b))?(a):(b)) |
| 10555 | 1184 #endif |
|
9635
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1185 subtitle* sub_fribidi (subtitle *sub, int sub_utf8) |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1186 { |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1187 FriBidiChar logical[LINE_LEN+1], visual[LINE_LEN+1]; // Hopefully these two won't smash the stack |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1188 char *ip = NULL, *op = NULL; |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1189 FriBidiCharType base; |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1190 size_t len,orig_len; |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1191 int l=sub->lines; |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1192 int char_set_num; |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1193 fribidi_boolean log2vis; |
|
10649
857a34ff479d
Fixes FriBiDi support and extends it with configure options. Patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
10555
diff
changeset
|
1194 if(flip_hebrew) { // Please fix the indentation someday |
|
9635
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1195 fribidi_set_mirroring (FRIBIDI_TRUE); |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1196 fribidi_set_reorder_nsm (FRIBIDI_FALSE); |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1197 |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1198 if( sub_utf8 == 0 ) { |
|
10649
857a34ff479d
Fixes FriBiDi support and extends it with configure options. Patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
10555
diff
changeset
|
1199 char_set_num = fribidi_parse_charset (fribidi_charset?fribidi_charset:"ISO8859-8"); |
|
9635
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1200 }else { |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1201 char_set_num = fribidi_parse_charset ("UTF-8"); |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1202 } |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1203 while (l) { |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1204 ip = sub->text[--l]; |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1205 orig_len = len = strlen( ip ); // We assume that we don't use full unicode, only UTF-8 or ISO8859-x |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1206 if(len > LINE_LEN) { |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1207 mp_msg(MSGT_SUBREADER,MSGL_WARN,"SUB: sub->text is longer than LINE_LEN.\n"); |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1208 l++; |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1209 break; |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1210 } |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1211 len = fribidi_charset_to_unicode (char_set_num, ip, len, logical); |
|
13679
59bb11213d11
correctly display the commas of most hebrew subtitles on the left side
faust3
parents:
13343
diff
changeset
|
1212 base = fribidi_flip_commas?FRIBIDI_TYPE_ON:FRIBIDI_TYPE_L; |
|
9635
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1213 log2vis = fribidi_log2vis (logical, len, &base, |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1214 /* output */ |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1215 visual, NULL, NULL, NULL); |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1216 if(log2vis) { |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1217 len = fribidi_remove_bidi_marks (visual, len, NULL, NULL, |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1218 NULL); |
| 10555 | 1219 if((op = (char*)malloc(sizeof(char)*(max(2*orig_len,2*len) + 1))) == NULL) { |
|
9635
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1220 mp_msg(MSGT_SUBREADER,MSGL_WARN,"SUB: error allocating mem.\n"); |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1221 l++; |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1222 break; |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1223 } |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1224 fribidi_unicode_to_charset ( char_set_num, visual, len,op); |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1225 free (ip); |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1226 sub->text[l] = op; |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1227 } |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1228 } |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1229 if (l){ |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1230 for (l = sub->lines; l;) |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1231 free (sub->text[--l]); |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1232 return ERR; |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1233 } |
|
10649
857a34ff479d
Fixes FriBiDi support and extends it with configure options. Patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
10555
diff
changeset
|
1234 } |
|
9635
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1235 return sub; |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1236 } |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1237 |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1238 #endif |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1239 |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1240 static void adjust_subs_time(subtitle* sub, float subtime, float fps, int block, |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1241 int sub_num, int sub_uses_time) { |
|
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1242 int n,m; |
|
4052
505f206d80d1
corrections to adjust_subs_time function which now uses fps if needed
atlka
parents:
4051
diff
changeset
|
1243 subtitle* nextsub; |
|
4051
0e7c382bc53a
added adjust_subs_time function which corrects bad sub->end time
atlka
parents:
4048
diff
changeset
|
1244 int i = sub_num; |
|
4052
505f206d80d1
corrections to adjust_subs_time function which now uses fps if needed
atlka
parents:
4051
diff
changeset
|
1245 unsigned long subfms = (sub_uses_time ? 100 : fps) * subtime; |
| 8206 | 1246 unsigned long overlap = (sub_uses_time ? 100 : fps) / 5; // 0.2s |
|
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1247 |
|
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1248 n=m=0; |
| 7610 | 1249 if (i) for (;;){ |
|
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1250 if (sub->end <= sub->start){ |
|
4052
505f206d80d1
corrections to adjust_subs_time function which now uses fps if needed
atlka
parents:
4051
diff
changeset
|
1251 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
|
1252 m++; |
|
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1253 n++; |
|
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1254 } |
|
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1255 if (!--i) break; |
|
4051
0e7c382bc53a
added adjust_subs_time function which corrects bad sub->end time
atlka
parents:
4048
diff
changeset
|
1256 nextsub = sub + 1; |
|
8882
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1257 if(block){ |
| 8206 | 1258 if ((sub->end > nextsub->start) && (sub->end <= nextsub->start + overlap)) { |
| 1259 // these subtitles overlap for less than 0.2 seconds | |
| 1260 // and would result in very short overlapping subtitle | |
| 1261 // so let's fix the problem here, before overlapping code | |
| 1262 // get its hands on them | |
| 1263 unsigned delta = sub->end - nextsub->start, half = delta / 2; | |
| 1264 sub->end -= half + 1; | |
| 1265 nextsub->start += delta - half; | |
| 1266 } | |
|
4051
0e7c382bc53a
added adjust_subs_time function which corrects bad sub->end time
atlka
parents:
4048
diff
changeset
|
1267 if (sub->end >= nextsub->start){ |
|
0e7c382bc53a
added adjust_subs_time function which corrects bad sub->end time
atlka
parents:
4048
diff
changeset
|
1268 sub->end = nextsub->start - 1; |
|
4052
505f206d80d1
corrections to adjust_subs_time function which now uses fps if needed
atlka
parents:
4051
diff
changeset
|
1269 if (sub->end - sub->start > subfms) |
|
505f206d80d1
corrections to adjust_subs_time function which now uses fps if needed
atlka
parents:
4051
diff
changeset
|
1270 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
|
1271 if (!m) |
|
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1272 n++; |
|
4051
0e7c382bc53a
added adjust_subs_time function which corrects bad sub->end time
atlka
parents:
4048
diff
changeset
|
1273 } |
|
8882
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1274 } |
| 7610 | 1275 |
| 1276 /* Theory: | |
| 1277 * Movies are often converted from FILM (24 fps) | |
| 1278 * to PAL (25) by simply speeding it up, so we | |
| 1279 * to multiply the original timestmaps by | |
| 1280 * (Movie's FPS / Subtitle's (guessed) FPS) | |
| 1281 * so eg. for 23.98 fps movie and PAL time based | |
| 1282 * subtitles we say -subfps 25 and we're fine! | |
| 1283 */ | |
| 1284 | |
| 1285 /* timed sub fps correction ::atmos */ | |
| 1286 if(sub_uses_time && sub_fps) { | |
| 1287 sub->start *= sub_fps/fps; | |
| 1288 sub->end *= sub_fps/fps; | |
| 1289 } | |
| 1290 | |
|
4051
0e7c382bc53a
added adjust_subs_time function which corrects bad sub->end time
atlka
parents:
4048
diff
changeset
|
1291 sub = nextsub; |
|
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1292 m = 0; |
|
4051
0e7c382bc53a
added adjust_subs_time function which corrects bad sub->end time
atlka
parents:
4048
diff
changeset
|
1293 } |
| 6296 | 1294 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
|
1295 } |
|
0e7c382bc53a
added adjust_subs_time function which corrects bad sub->end time
atlka
parents:
4048
diff
changeset
|
1296 |
|
9009
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
1297 struct subreader { |
|
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
1298 subtitle * (*read)(FILE *fd,subtitle *dest); |
|
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
1299 void (*post)(subtitle *dest); |
|
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
1300 const char *name; |
|
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
1301 }; |
|
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
1302 |
| 12443 | 1303 #ifdef HAVE_ENCA |
| 1304 #define MAX_GUESS_BUFFER_SIZE (256*1024) | |
| 1305 void* guess_cp(FILE *fd, char *preferred_language, char *fallback) | |
| 1306 { | |
| 1307 const char **languages; | |
| 1308 size_t langcnt, buflen; | |
| 1309 EncaAnalyser analyser; | |
| 1310 EncaEncoding encoding; | |
| 1311 unsigned char *buffer; | |
| 1312 char *detected_sub_cp = NULL; | |
| 1313 int i; | |
| 1314 | |
| 1315 buffer = (unsigned char*)malloc(MAX_GUESS_BUFFER_SIZE*sizeof(char)); | |
| 1316 buflen = fread(buffer, 1, MAX_GUESS_BUFFER_SIZE, fd); | |
| 1317 | |
| 1318 languages = enca_get_languages(&langcnt); | |
| 1319 mp_msg(MSGT_SUBREADER, MSGL_V, "ENCA supported languages: "); | |
| 1320 for (i = 0; i < langcnt; i++) { | |
| 1321 mp_msg(MSGT_SUBREADER, MSGL_V, "%s ", languages[i]); | |
| 1322 } | |
| 1323 mp_msg(MSGT_SUBREADER, MSGL_V, "\n"); | |
| 1324 | |
| 1325 for (i = 0; i < langcnt; i++) { | |
|
15382
ba07942279c5
strdup() of a NULL pointer, truckload of cola for me
henry
parents:
14642
diff
changeset
|
1326 char *tmp; |
|
ba07942279c5
strdup() of a NULL pointer, truckload of cola for me
henry
parents:
14642
diff
changeset
|
1327 |
| 12443 | 1328 if (strcasecmp(languages[i], preferred_language) != 0) continue; |
| 1329 analyser = enca_analyser_alloc(languages[i]); | |
| 1330 encoding = enca_analyse_const(analyser, buffer, buflen); | |
|
15382
ba07942279c5
strdup() of a NULL pointer, truckload of cola for me
henry
parents:
14642
diff
changeset
|
1331 tmp = enca_charset_name(encoding.charset, ENCA_NAME_STYLE_ICONV); |
| 15562 | 1332 if (tmp && encoding.charset != ENCA_CS_UNKNOWN) { |
|
15382
ba07942279c5
strdup() of a NULL pointer, truckload of cola for me
henry
parents:
14642
diff
changeset
|
1333 detected_sub_cp = strdup(tmp); |
|
ba07942279c5
strdup() of a NULL pointer, truckload of cola for me
henry
parents:
14642
diff
changeset
|
1334 mp_msg(MSGT_SUBREADER, MSGL_INFO, "ENCA detected charset: %s\n", tmp); |
|
ba07942279c5
strdup() of a NULL pointer, truckload of cola for me
henry
parents:
14642
diff
changeset
|
1335 } |
| 12443 | 1336 enca_analyser_free(analyser); |
| 1337 } | |
| 1338 | |
| 1339 free(languages); | |
| 1340 free(buffer); | |
| 1341 rewind(fd); | |
| 1342 | |
|
15382
ba07942279c5
strdup() of a NULL pointer, truckload of cola for me
henry
parents:
14642
diff
changeset
|
1343 if (!detected_sub_cp) { |
|
ba07942279c5
strdup() of a NULL pointer, truckload of cola for me
henry
parents:
14642
diff
changeset
|
1344 detected_sub_cp = strdup(fallback); |
|
ba07942279c5
strdup() of a NULL pointer, truckload of cola for me
henry
parents:
14642
diff
changeset
|
1345 mp_msg(MSGT_SUBREADER, MSGL_INFO, "ENCA detection failed: fallback to %s\n", fallback); |
|
ba07942279c5
strdup() of a NULL pointer, truckload of cola for me
henry
parents:
14642
diff
changeset
|
1346 } |
| 12443 | 1347 |
| 1348 return detected_sub_cp; | |
| 1349 } | |
| 1350 #endif | |
| 1351 | |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1352 sub_data* sub_read_file (char *filename, float fps) { |
| 258 | 1353 FILE *fd; |
|
7983
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1354 int n_max, n_first, i, j, sub_first, sub_orig; |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1355 subtitle *first, *second, *sub, *return_sub; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1356 sub_data *subt_data; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1357 int uses_time = 0, sub_num = 0, sub_errs = 0; |
|
9009
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
1358 struct subreader sr[]= |
| 258 | 1359 { |
|
9009
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
1360 { sub_read_line_microdvd, NULL, "microdvd" }, |
|
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
1361 { sub_read_line_subrip, NULL, "subrip" }, |
|
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
1362 { sub_read_line_subviewer, NULL, "subviewer" }, |
|
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
1363 { sub_read_line_sami, NULL, "sami" }, |
|
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
1364 { sub_read_line_vplayer, NULL, "vplayer" }, |
|
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
1365 { sub_read_line_rt, NULL, "rt" }, |
|
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
1366 { sub_read_line_ssa, sub_pp_ssa, "ssa" }, |
| 11873 | 1367 { sub_read_line_pjs, NULL, "pjs" }, |
|
9009
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
1368 { sub_read_line_mpsub, NULL, "mpsub" }, |
|
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
1369 { sub_read_line_aqt, NULL, "aqt" }, |
|
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
1370 { sub_read_line_subviewer2, NULL, "subviewer 2.0" }, |
|
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
1371 { sub_read_line_subrip09, NULL, "subrip 0.9" }, |
|
12138
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
1372 { sub_read_line_jacosub, NULL, "jacosub" }, |
|
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
1373 { sub_read_line_mpl2, NULL, "mpl2" } |
| 258 | 1374 }; |
|
9009
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
1375 struct subreader *srp; |
|
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
1376 |
| 2915 | 1377 if(filename==NULL) return NULL; //qnx segfault |
| 258 | 1378 fd=fopen (filename, "r"); if (!fd) return NULL; |
|
10353
ee46cdf03028
small correction of sub_utf8 restoring between reading sub files
atlka
parents:
10340
diff
changeset
|
1379 |
|
ee46cdf03028
small correction of sub_utf8 restoring between reading sub files
atlka
parents:
10340
diff
changeset
|
1380 sub_format=sub_autodetect (fd, &uses_time); |
|
ee46cdf03028
small correction of sub_utf8 restoring between reading sub files
atlka
parents:
10340
diff
changeset
|
1381 mpsub_multiplier = (uses_time ? 100.0 : 1.0); |
|
ee46cdf03028
small correction of sub_utf8 restoring between reading sub files
atlka
parents:
10340
diff
changeset
|
1382 if (sub_format==SUB_INVALID) {mp_msg(MSGT_SUBREADER,MSGL_WARN,"SUB: Could not determine file format\n");return NULL;} |
|
ee46cdf03028
small correction of sub_utf8 restoring between reading sub files
atlka
parents:
10340
diff
changeset
|
1383 srp=sr+sub_format; |
|
ee46cdf03028
small correction of sub_utf8 restoring between reading sub files
atlka
parents:
10340
diff
changeset
|
1384 mp_msg(MSGT_SUBREADER,MSGL_INFO,"SUB: Detected subtitle file format: %s\n", srp->name); |
|
ee46cdf03028
small correction of sub_utf8 restoring between reading sub files
atlka
parents:
10340
diff
changeset
|
1385 |
|
ee46cdf03028
small correction of sub_utf8 restoring between reading sub files
atlka
parents:
10340
diff
changeset
|
1386 rewind (fd); |
|
ee46cdf03028
small correction of sub_utf8 restoring between reading sub files
atlka
parents:
10340
diff
changeset
|
1387 |
| 12455 | 1388 #ifdef USE_ICONV |
|
10353
ee46cdf03028
small correction of sub_utf8 restoring between reading sub files
atlka
parents:
10340
diff
changeset
|
1389 sub_utf8_prev=sub_utf8; |
|
10340
2eaabacd1429
prefer UTF-8 encoding subs and automatically recognize them by suffix
atlka
parents:
10336
diff
changeset
|
1390 { |
| 10354 | 1391 int l,k; |
| 1392 k = -1; | |
|
10340
2eaabacd1429
prefer UTF-8 encoding subs and automatically recognize them by suffix
atlka
parents:
10336
diff
changeset
|
1393 if ((l=strlen(filename))>4){ |
|
2eaabacd1429
prefer UTF-8 encoding subs and automatically recognize them by suffix
atlka
parents:
10336
diff
changeset
|
1394 char *exts[] = {".utf", ".utf8", ".utf-8" }; |
|
2eaabacd1429
prefer UTF-8 encoding subs and automatically recognize them by suffix
atlka
parents:
10336
diff
changeset
|
1395 for (k=3;--k>=0;) |
|
2eaabacd1429
prefer UTF-8 encoding subs and automatically recognize them by suffix
atlka
parents:
10336
diff
changeset
|
1396 if (!strcasecmp(filename+(l - strlen(exts[k])), exts[k])){ |
|
2eaabacd1429
prefer UTF-8 encoding subs and automatically recognize them by suffix
atlka
parents:
10336
diff
changeset
|
1397 sub_utf8 = 1; |
|
2eaabacd1429
prefer UTF-8 encoding subs and automatically recognize them by suffix
atlka
parents:
10336
diff
changeset
|
1398 break; |
|
2eaabacd1429
prefer UTF-8 encoding subs and automatically recognize them by suffix
atlka
parents:
10336
diff
changeset
|
1399 } |
|
2eaabacd1429
prefer UTF-8 encoding subs and automatically recognize them by suffix
atlka
parents:
10336
diff
changeset
|
1400 } |
|
12909
dc8eba991005
fixes a crash and unchecked string-handling in ENCA code.
reimar
parents:
12646
diff
changeset
|
1401 if (k<0) subcp_open(fd); |
|
10340
2eaabacd1429
prefer UTF-8 encoding subs and automatically recognize them by suffix
atlka
parents:
10336
diff
changeset
|
1402 } |
|
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1403 #endif |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1404 |
| 258 | 1405 sub_num=0;n_max=32; |
| 1406 first=(subtitle *)malloc(n_max*sizeof(subtitle)); | |
| 10354 | 1407 if(!first){ |
| 1408 #ifdef USE_ICONV | |
| 1409 subcp_close(); | |
| 1410 sub_utf8=sub_utf8_prev; | |
| 1411 #endif | |
| 1412 return NULL; | |
| 1413 } | |
| 258 | 1414 |
|
8362
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1415 #ifdef USE_SORTSUB |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1416 sub = (subtitle *)malloc(sizeof(subtitle)); |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1417 //This is to deal with those formats (AQT & Subrip) which define the end of a subtitle |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1418 //as the beginning of the following |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1419 previous_sub_end = 0; |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1420 #endif |
| 258 | 1421 while(1){ |
| 1422 if(sub_num>=n_max){ | |
| 1423 n_max+=16; | |
| 1424 first=realloc(first,n_max*sizeof(subtitle)); | |
| 1425 } | |
|
8362
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1426 #ifndef USE_SORTSUB |
|
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1427 sub = &first[sub_num]; |
|
8362
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1428 #endif |
|
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1429 memset(sub, '\0', sizeof(subtitle)); |
|
9009
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
1430 sub=srp->read(fd,sub); |
| 258 | 1431 if(!sub) break; // EOF |
|
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1432 #ifdef USE_ICONV |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1433 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
|
1434 #endif |
|
9635
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1435 #ifdef USE_FRIBIDI |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1436 if (sub!=ERR) sub=sub_fribidi(sub,sub_utf8); |
|
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1437 #endif |
| 9056 | 1438 if ( sub == ERR ) |
| 1439 { | |
| 1440 #ifdef USE_ICONV | |
| 1441 subcp_close(); | |
| 1442 #endif | |
| 1443 if ( first ) free(first); | |
| 1444 return NULL; | |
| 1445 } | |
|
9009
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
1446 // Apply any post processing that needs recoding first |
|
9126
7a06258271d6
Add a command line option (-sub-no-text-pp) to disable subtitles
arpi
parents:
9056
diff
changeset
|
1447 if ((sub!=ERR) && !sub_no_text_pp && srp->post) srp->post(sub); |
|
8362
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1448 #ifdef USE_SORTSUB |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1449 if(!sub_num || (first[sub_num - 1].start <= sub->start)){ |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1450 first[sub_num].start = sub->start; |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1451 first[sub_num].end = sub->end; |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1452 first[sub_num].lines = sub->lines; |
|
10916
c36db88bfbc4
Subtitle alignment & smart splitting by Salvatore Falco
henry
parents:
10801
diff
changeset
|
1453 first[sub_num].alignment = sub->alignment; |
|
8362
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1454 for(i = 0; i < sub->lines; ++i){ |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1455 first[sub_num].text[i] = sub->text[i]; |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1456 } |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1457 if (previous_sub_end){ |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1458 first[sub_num - 1].end = previous_sub_end; |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1459 previous_sub_end = 0; |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1460 } |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1461 } else { |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1462 for(j = sub_num - 1; j >= 0; --j){ |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1463 first[j + 1].start = first[j].start; |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1464 first[j + 1].end = first[j].end; |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1465 first[j + 1].lines = first[j].lines; |
|
10916
c36db88bfbc4
Subtitle alignment & smart splitting by Salvatore Falco
henry
parents:
10801
diff
changeset
|
1466 first[j + 1].alignment = first[j].alignment; |
|
8362
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1467 for(i = 0; i < first[j].lines; ++i){ |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1468 first[j + 1].text[i] = first[j].text[i]; |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1469 } |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1470 if(!j || (first[j - 1].start <= sub->start)){ |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1471 first[j].start = sub->start; |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1472 first[j].end = sub->end; |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1473 first[j].lines = sub->lines; |
|
10916
c36db88bfbc4
Subtitle alignment & smart splitting by Salvatore Falco
henry
parents:
10801
diff
changeset
|
1474 first[j].alignment = sub->alignment; |
|
8362
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1475 for(i = 0; i < SUB_MAX_TEXT; ++i){ |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1476 first[j].text[i] = sub->text[i]; |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1477 } |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1478 if (previous_sub_end){ |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1479 first[j].end = first[j - 1].end; |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1480 first[j - 1].end = previous_sub_end; |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1481 previous_sub_end = 0; |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1482 } |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1483 break; |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1484 } |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1485 } |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1486 } |
|
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1487 #endif |
| 258 | 1488 if(sub==ERR) ++sub_errs; else ++sub_num; // Error vs. Valid |
| 1489 } | |
| 1490 | |
| 1491 fclose(fd); | |
| 1492 | |
|
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1493 #ifdef USE_ICONV |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1494 subcp_close(); |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1495 #endif |
|
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1496 |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1497 // printf ("SUB: Subtitle format %s time.\n", uses_time?"uses":"doesn't use"); |
| 6296 | 1498 mp_msg(MSGT_SUBREADER,MSGL_INFO,"SUB: Read %i subtitles", sub_num); |
| 1499 if (sub_errs) mp_msg(MSGT_SUBREADER,MSGL_INFO,", %i bad line(s).\n", sub_errs); | |
| 1500 else mp_msg(MSGT_SUBREADER,MSGL_INFO,".\n"); | |
| 258 | 1501 |
| 2880 | 1502 if(sub_num<=0){ |
| 1503 free(first); | |
| 1504 return NULL; | |
| 1505 } | |
| 1506 | |
|
8882
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1507 // we do overlap if the user forced it (suboverlap_enable == 2) or |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1508 // the user didn't forced no-overlapsub and the format is Jacosub or Ssa. |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1509 // this is because usually overlapping subtitles are found in these formats, |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1510 // while in others they are probably result of bad timing |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1511 if ((suboverlap_enabled == 2) || |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1512 ((suboverlap_enabled) && ((sub_format == SUB_JACOSUB) || (sub_format == SUB_SSA)))) { |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1513 adjust_subs_time(first, 6.0, fps, 0, sub_num, uses_time);/*~6 secs AST*/ |
|
7983
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1514 // here we manage overlapping subtitles |
|
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1515 sub_orig = sub_num; |
|
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1516 n_first = sub_num; |
|
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1517 sub_num = 0; |
|
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1518 second = NULL; |
|
8882
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1519 // for each subtitle in first[] we deal with its 'block' of |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1520 // bonded subtitles |
|
7983
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1521 for (sub_first = 0; sub_first < n_first; ++sub_first) { |
|
8882
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1522 unsigned long global_start = first[sub_first].start, |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1523 global_end = first[sub_first].end, local_start, local_end; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1524 int lines_to_add = first[sub_first].lines, sub_to_add = 0, |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1525 **placeholder = NULL, higher_line = 0, counter, start_block_sub = sub_num; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1526 char real_block = 1; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1527 |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1528 // here we find the number of subtitles inside the 'block' |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1529 // and its span interval. this works well only with sorted |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1530 // subtitles |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1531 while ((sub_first + sub_to_add + 1 < n_first) && (first[sub_first + sub_to_add + 1].start < global_end)) { |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1532 ++sub_to_add; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1533 lines_to_add += first[sub_first + sub_to_add].lines; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1534 if (first[sub_first + sub_to_add].start < global_start) { |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1535 global_start = first[sub_first + sub_to_add].start; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1536 } |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1537 if (first[sub_first + sub_to_add].end > global_end) { |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1538 global_end = first[sub_first + sub_to_add].end; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1539 } |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1540 } |
|
7983
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1541 |
|
8882
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1542 // we need a structure to keep trace of the screen lines |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1543 // used by the subs, a 'placeholder' |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1544 counter = 2 * sub_to_add + 1; // the maximum number of subs derived |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1545 // from a block of sub_to_add+1 subs |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1546 placeholder = (int **) malloc(sizeof(int *) * counter); |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1547 for (i = 0; i < counter; ++i) { |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1548 placeholder[i] = (int *) malloc(sizeof(int) * lines_to_add); |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1549 for (j = 0; j < lines_to_add; ++j) { |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1550 placeholder[i][j] = -1; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1551 } |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1552 } |
|
7983
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1553 |
|
8882
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1554 counter = 0; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1555 local_end = global_start - 1; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1556 do { |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1557 int ls; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1558 |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1559 // here we find the beginning and the end of a new |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1560 // subtitle in the block |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1561 local_start = local_end + 1; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1562 local_end = global_end; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1563 for (j = 0; j <= sub_to_add; ++j) { |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1564 if ((first[sub_first + j].start - 1 > local_start) && (first[sub_first + j].start - 1 < local_end)) { |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1565 local_end = first[sub_first + j].start - 1; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1566 } else if ((first[sub_first + j].end > local_start) && (first[sub_first + j].end < local_end)) { |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1567 local_end = first[sub_first + j].end; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1568 } |
|
7983
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1569 } |
|
8882
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1570 // here we allocate the screen lines to subs we must |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1571 // display in current local_start-local_end interval. |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1572 // if the subs were yet presents in the previous interval |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1573 // they keep the same lines, otherside they get unused lines |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1574 for (j = 0; j <= sub_to_add; ++j) { |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1575 if ((first[sub_first + j].start <= local_end) && (first[sub_first + j].end > local_start)) { |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1576 unsigned long sub_lines = first[sub_first + j].lines, fragment_length = lines_to_add + 1, |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1577 tmp = 0; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1578 char boolean = 0; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1579 int fragment_position = -1; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1580 |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1581 // if this is not the first new sub of the block |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1582 // we find if this sub was present in the previous |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1583 // new sub |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1584 if (counter) |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1585 for (i = 0; i < lines_to_add; ++i) { |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1586 if (placeholder[counter - 1][i] == sub_first + j) { |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1587 placeholder[counter][i] = sub_first + j; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1588 boolean = 1; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1589 } |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1590 } |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1591 if (boolean) |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1592 continue; |
|
7983
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1593 |
|
8882
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1594 // we are looking for the shortest among all groups of |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1595 // sequential blank lines whose length is greater than or |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1596 // equal to sub_lines. we store in fragment_position the |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1597 // position of the shortest group, in fragment_length its |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1598 // length, and in tmp the length of the group currently |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1599 // examinated |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1600 for (i = 0; i < lines_to_add; ++i) { |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1601 if (placeholder[counter][i] == -1) { |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1602 // placeholder[counter][i] is part of the current group |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1603 // of blank lines |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1604 ++tmp; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1605 } else { |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1606 if (tmp == sub_lines) { |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1607 // current group's size fits exactly the one we |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1608 // need, so we stop looking |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1609 fragment_position = i - tmp; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1610 tmp = 0; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1611 break; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1612 } |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1613 if ((tmp) && (tmp > sub_lines) && (tmp < fragment_length)) { |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1614 // current group is the best we found till here, |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1615 // but is still bigger than the one we are looking |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1616 // for, so we keep on looking |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1617 fragment_length = tmp; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1618 fragment_position = i - tmp; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1619 tmp = 0; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1620 } else { |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1621 // current group doesn't fit at all, so we forget it |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1622 tmp = 0; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1623 } |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1624 } |
|
7983
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1625 } |
|
8882
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1626 if (tmp) { |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1627 // last screen line is blank, a group ends with it |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1628 if ((tmp >= sub_lines) && (tmp < fragment_length)) { |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1629 fragment_position = i - tmp; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1630 } |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1631 } |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1632 if (fragment_position == -1) { |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1633 // it was not possible to find free screen line(s) for a subtitle, |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1634 // usually this means a bug in the code; however we do not overlap |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1635 mp_msg(MSGT_SUBREADER, MSGL_WARN, "SUB: we could not find a suitable position for an overlapping subtitle\n"); |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1636 higher_line = SUB_MAX_TEXT + 1; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1637 break; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1638 } else { |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1639 for (tmp = 0; tmp < sub_lines; ++tmp) { |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1640 placeholder[counter][fragment_position + tmp] = sub_first + j; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1641 } |
|
7983
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1642 } |
|
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1643 } |
|
8882
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1644 } |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1645 for (j = higher_line + 1; j < lines_to_add; ++j) { |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1646 if (placeholder[counter][j] != -1) |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1647 higher_line = j; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1648 else |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1649 break; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1650 } |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1651 if (higher_line >= SUB_MAX_TEXT) { |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1652 // the 'block' has too much lines, so we don't overlap the |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1653 // subtitles |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1654 second = (subtitle *) realloc(second, (sub_num + sub_to_add + 1) * sizeof(subtitle)); |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1655 for (j = 0; j <= sub_to_add; ++j) { |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1656 int ls; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1657 memset(&second[sub_num + j], '\0', sizeof(subtitle)); |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1658 second[sub_num + j].start = first[sub_first + j].start; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1659 second[sub_num + j].end = first[sub_first + j].end; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1660 second[sub_num + j].lines = first[sub_first + j].lines; |
|
10916
c36db88bfbc4
Subtitle alignment & smart splitting by Salvatore Falco
henry
parents:
10801
diff
changeset
|
1661 second[sub_num + j].alignment = first[sub_first + j].alignment; |
|
8882
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1662 for (ls = 0; ls < second[sub_num + j].lines; ls++) { |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1663 second[sub_num + j].text[ls] = strdup(first[sub_first + j].text[ls]); |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1664 } |
|
7983
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1665 } |
|
8882
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1666 sub_num += sub_to_add + 1; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1667 sub_first += sub_to_add; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1668 real_block = 0; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1669 break; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1670 } |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1671 |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1672 // we read the placeholder structure and create the new |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1673 // subs. |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1674 second = (subtitle *) realloc(second, (sub_num + 1) * sizeof(subtitle)); |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1675 memset(&second[sub_num], '\0', sizeof(subtitle)); |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1676 second[sub_num].start = local_start; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1677 second[sub_num].end = local_end; |
|
13343
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
1678 second[sub_num].alignment = first[sub_first].alignment; |
|
8882
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1679 n_max = (lines_to_add < SUB_MAX_TEXT) ? lines_to_add : SUB_MAX_TEXT; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1680 for (i = 0, j = 0; j < n_max; ++j) { |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1681 if (placeholder[counter][j] != -1) { |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1682 int lines = first[placeholder[counter][j]].lines; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1683 for (ls = 0; ls < lines; ++ls) { |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1684 second[sub_num].text[i++] = strdup(first[placeholder[counter][j]].text[ls]); |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1685 } |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1686 j += lines - 1; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1687 } else { |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1688 second[sub_num].text[i++] = strdup(" "); |
|
7983
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1689 } |
|
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1690 } |
|
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1691 ++sub_num; |
|
8882
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1692 ++counter; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1693 } while (local_end < global_end); |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1694 if (real_block) |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1695 for (i = 0; i < counter; ++i) |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1696 second[start_block_sub + i].lines = higher_line + 1; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1697 |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1698 counter = 2 * sub_to_add + 1; |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1699 for (i = 0; i < counter; ++i) { |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1700 free(placeholder[i]); |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1701 } |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1702 free(placeholder); |
|
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1703 sub_first += sub_to_add; |
|
7983
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1704 } |
|
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1705 |
| 8734 | 1706 for (j = sub_orig - 1; j >= 0; --j) { |
| 1707 for (i = first[j].lines - 1; i >= 0; --i) { | |
|
7983
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1708 free(first[j].text[i]); |
|
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1709 } |
|
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1710 } |
| 8785 | 1711 free(first); |
|
7983
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1712 |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1713 return_sub = second; |
|
8361
2202c00001e3
overlapping subtitles support is now optional, can be disabled (-nooverlapsub)
arpi
parents:
8360
diff
changeset
|
1714 } else { //if(suboverlap_enabled) |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1715 adjust_subs_time(first, 6.0, fps, 1, sub_num, uses_time);/*~6 secs AST*/ |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1716 return_sub = first; |
|
8361
2202c00001e3
overlapping subtitles support is now optional, can be disabled (-nooverlapsub)
arpi
parents:
8360
diff
changeset
|
1717 } |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1718 if (return_sub == NULL) return NULL; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1719 subt_data = (sub_data *)malloc(sizeof(sub_data)); |
|
15603
2d1ad16b6021
strdup subtitle filename at a more appropriate place, fixing memleaks and
reimar
parents:
15562
diff
changeset
|
1720 subt_data->filename = strdup(filename); |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1721 subt_data->sub_uses_time = uses_time; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1722 subt_data->sub_num = sub_num; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1723 subt_data->sub_errs = sub_errs; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1724 subt_data->subtitles = return_sub; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1725 return subt_data; |
| 258 | 1726 } |
| 1727 | |
| 892 | 1728 #if 0 |
| 509 | 1729 char * strreplace( char * in,char * what,char * whereof ) |
| 1730 { | |
| 1731 int i; | |
| 1732 char * tmp; | |
| 1733 | |
| 1734 if ( ( in == NULL )||( what == NULL )||( whereof == NULL )||( ( tmp=strstr( in,what ) ) == NULL ) ) return NULL; | |
| 1735 for( i=0;i<strlen( whereof );i++ ) tmp[i]=whereof[i]; | |
| 1736 if ( strlen( what ) > strlen( whereof ) ) tmp[i]=0; | |
| 1737 return in; | |
| 1738 } | |
| 892 | 1739 #endif |
| 509 | 1740 |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1741 |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1742 static void strcpy_trim(char *d, char *s) |
| 509 | 1743 { |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1744 // skip leading whitespace |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1745 while (*s && !isalnum(*s)) { |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1746 s++; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1747 } |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1748 for (;;) { |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1749 // copy word |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1750 while (*s && isalnum(*s)) { |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1751 *d = tolower(*s); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1752 s++; d++; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1753 } |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1754 if (*s == 0) break; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1755 // trim excess whitespace |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1756 while (*s && !isalnum(*s)) { |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1757 s++; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1758 } |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1759 if (*s == 0) break; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1760 *d++ = ' '; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1761 } |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1762 *d = 0; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1763 } |
| 892 | 1764 |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1765 static void strcpy_strip_ext(char *d, char *s) |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1766 { |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1767 char *tmp = strrchr(s,'.'); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1768 if (!tmp) { |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1769 strcpy(d, s); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1770 return; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1771 } else { |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1772 strncpy(d, s, tmp-s); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1773 d[tmp-s] = 0; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1774 } |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1775 while (*d) { |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1776 *d = tolower(*d); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1777 d++; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1778 } |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1779 } |
| 892 | 1780 |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1781 static void strcpy_get_ext(char *d, char *s) |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1782 { |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1783 char *tmp = strrchr(s,'.'); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1784 if (!tmp) { |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1785 strcpy(d, ""); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1786 return; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1787 } else { |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1788 strcpy(d, tmp+1); |
| 892 | 1789 } |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1790 } |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1791 |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1792 static int whiteonly(char *s) |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1793 { |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1794 while (*s) { |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1795 if (isalnum(*s)) return 0; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1796 s++; |
| 509 | 1797 } |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1798 return 1; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1799 } |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1800 |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1801 typedef struct _subfn |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1802 { |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1803 int priority; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1804 char *fname; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1805 } subfn; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1806 |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1807 static int compare_sub_priority(const void *a, const void *b) |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1808 { |
| 9895 | 1809 if (((subfn*)a)->priority > ((subfn*)b)->priority) { |
| 1810 return -1; | |
| 1811 } else if (((subfn*)a)->priority < ((subfn*)b)->priority) { | |
| 1812 return 1; | |
| 1813 } else { | |
| 1814 return strcoll(((subfn*)a)->fname, ((subfn*)b)->fname); | |
| 1815 } | |
| 509 | 1816 } |
| 1817 | |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1818 char** sub_filenames(char* path, char *fname) |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1819 { |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1820 char *f_dir, *f_fname, *f_fname_noext, *f_fname_trim, *tmp, *tmp_sub_id; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1821 char *tmp_fname_noext, *tmp_fname_trim, *tmp_fname_ext, *tmpresult; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1822 |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1823 int len, pos, found, i, j; |
|
10801
6c56b4aff706
Jacosub files can have the extension '.js' too. Patch by Vladimir Mosgalin <mosgalin@VM10124.spb.edu>
alex
parents:
10692
diff
changeset
|
1824 char * sub_exts[] = { "utf", "utf8", "utf-8", "sub", "srt", "smi", "rt", "txt", "ssa", "aqt", "jss", "js", "ass", NULL}; |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1825 subfn *result; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1826 char **result2; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1827 |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1828 int subcnt; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1829 |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1830 FILE *f; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1831 |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1832 DIR *d; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1833 struct dirent *de; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1834 |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1835 len = (strlen(fname) > 256 ? strlen(fname) : 256) |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1836 +(strlen(path) > 256 ? strlen(path) : 256)+2; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1837 |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1838 f_dir = (char*)malloc(len); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1839 f_fname = (char*)malloc(len); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1840 f_fname_noext = (char*)malloc(len); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1841 f_fname_trim = (char*)malloc(len); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1842 |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1843 tmp_fname_noext = (char*)malloc(len); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1844 tmp_fname_trim = (char*)malloc(len); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1845 tmp_fname_ext = (char*)malloc(len); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1846 |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1847 tmpresult = (char*)malloc(len); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1848 |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1849 result = (subfn*)malloc(sizeof(subfn)*MAX_SUBTITLE_FILES); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1850 memset(result, 0, sizeof(subfn)*MAX_SUBTITLE_FILES); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1851 |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1852 subcnt = 0; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1853 |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1854 tmp = strrchr(fname,'/'); |
| 11062 | 1855 #ifdef WIN32 |
| 1856 if(!tmp)tmp = strrchr(fname,'\\'); | |
| 1857 #endif | |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1858 |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1859 // extract filename & dirname from fname |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1860 if (tmp) { |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1861 strcpy(f_fname, tmp+1); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1862 pos = tmp - fname; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1863 strncpy(f_dir, fname, pos+1); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1864 f_dir[pos+1] = 0; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1865 } else { |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1866 strcpy(f_fname, fname); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1867 strcpy(f_dir, "./"); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1868 } |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1869 |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1870 strcpy_strip_ext(f_fname_noext, f_fname); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1871 strcpy_trim(f_fname_trim, f_fname_noext); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1872 |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1873 tmp_sub_id = NULL; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1874 if (dvdsub_lang && !whiteonly(dvdsub_lang)) { |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1875 tmp_sub_id = (char*)malloc(strlen(dvdsub_lang)+1); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1876 strcpy_trim(tmp_sub_id, dvdsub_lang); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1877 } |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1878 |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1879 // 0 = nothing |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1880 // 1 = any subtitle file |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1881 // 2 = any sub file containing movie name |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1882 // 3 = sub file containing movie name and the lang extension |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1883 for (j = 0; j <= 1; j++) { |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1884 d = opendir(j == 0 ? f_dir : path); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1885 if (d) { |
| 10236 | 1886 while ((de = readdir(d))) { |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1887 // retrieve various parts of the filename |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1888 strcpy_strip_ext(tmp_fname_noext, de->d_name); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1889 strcpy_get_ext(tmp_fname_ext, de->d_name); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1890 strcpy_trim(tmp_fname_trim, tmp_fname_noext); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1891 |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1892 // does it end with a subtitle extension? |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1893 found = 0; |
| 9872 | 1894 #ifdef USE_ICONV |
| 12443 | 1895 #ifdef HAVE_ENCA |
| 1896 for (i = ((sub_cp && strncasecmp(sub_cp, "enca", 4) != 0) ? 3 : 0); sub_exts[i]; i++) { | |
| 1897 #else | |
|
10340
2eaabacd1429
prefer UTF-8 encoding subs and automatically recognize them by suffix
atlka
parents:
10336
diff
changeset
|
1898 for (i = (sub_cp ? 3 : 0); sub_exts[i]; i++) { |
| 12443 | 1899 #endif |
| 9872 | 1900 #else |
| 1901 for (i = 0; sub_exts[i]; i++) { | |
| 1902 #endif | |
|
13229
b1e482fcd919
subtitle autodetection regardles of case (bug #65), patches Michal Svec <rebel at atrey.karlin.mff.cuni.cz> and Reynaldo H. Verdejo Pinochet <reynaldo at opendot.cl>
faust3
parents:
12909
diff
changeset
|
1903 if (strcasecmp(sub_exts[i], tmp_fname_ext) == 0) { |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1904 found = 1; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1905 break; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1906 } |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1907 } |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1908 |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1909 // we have a (likely) subtitle file |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1910 if (found) { |
| 9895 | 1911 int prio = 0; |
| 10551 | 1912 if (!prio && tmp_sub_id) |
|
10486
f3540688a9ec
fix against dummy solaris sprintf, bug reported by Gotz Waschk
alex
parents:
10450
diff
changeset
|
1913 { |
| 10551 | 1914 sprintf(tmpresult, "%s %s", f_fname_trim, tmp_sub_id); |
| 1915 printf("dvdsublang...%s\n", tmpresult); | |
| 1916 if (strcmp(tmp_fname_trim, tmpresult) == 0 && sub_match_fuzziness >= 1) { | |
| 1917 // matches the movie name + lang extension | |
| 1918 prio = 5; | |
| 1919 } | |
| 1920 } | |
| 1921 if (!prio && strcmp(tmp_fname_trim, f_fname_trim) == 0) { | |
| 9895 | 1922 // matches the movie name |
| 1923 prio = 4; | |
| 10551 | 1924 } |
| 1925 if (!prio && (tmp = strstr(tmp_fname_trim, f_fname_trim)) && (sub_match_fuzziness >= 1)) { | |
| 9895 | 1926 // contains the movie name |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1927 tmp += strlen(f_fname_trim); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1928 if (tmp_sub_id && strstr(tmp, tmp_sub_id)) { |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1929 // with sub_id specified prefer localized subtitles |
| 9895 | 1930 prio = 3; |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1931 } else if ((tmp_sub_id == NULL) && whiteonly(tmp)) { |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1932 // without sub_id prefer "plain" name |
| 9895 | 1933 prio = 3; |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1934 } else { |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1935 // with no localized subs found, try any else instead |
| 9895 | 1936 prio = 2; |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1937 } |
| 10551 | 1938 } |
| 1939 if (!prio) { | |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1940 // doesn't contain the movie name |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1941 // don't try in the mplayer subtitle directory |
| 9893 | 1942 if ((j == 0) && (sub_match_fuzziness >= 2)) { |
| 9895 | 1943 prio = 1; |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1944 } |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1945 } |
| 9895 | 1946 |
| 1947 if (prio) { | |
|
10340
2eaabacd1429
prefer UTF-8 encoding subs and automatically recognize them by suffix
atlka
parents:
10336
diff
changeset
|
1948 prio += prio; |
|
10494
db0bc96da95f
1, micro-speedup 2, fixed 10l: only prefer utf8 if iconv is present
alex
parents:
10486
diff
changeset
|
1949 #ifdef USE_ICONV |
| 10932 | 1950 if (i<3){ // prefer UTF-8 coded |
|
10340
2eaabacd1429
prefer UTF-8 encoding subs and automatically recognize them by suffix
atlka
parents:
10336
diff
changeset
|
1951 prio++; |
| 10929 | 1952 } |
|
10494
db0bc96da95f
1, micro-speedup 2, fixed 10l: only prefer utf8 if iconv is present
alex
parents:
10486
diff
changeset
|
1953 #endif |
| 10336 | 1954 sprintf(tmpresult, "%s%s", j == 0 ? f_dir : path, de->d_name); |
| 9895 | 1955 // fprintf(stderr, "%s priority %d\n", tmpresult, prio); |
| 1956 if ((f = fopen(tmpresult, "rt"))) { | |
| 1957 fclose(f); | |
| 1958 result[subcnt].priority = prio; | |
| 1959 result[subcnt].fname = strdup(tmpresult); | |
| 1960 subcnt++; | |
| 1961 } | |
| 1962 } | |
| 1963 | |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1964 } |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1965 if (subcnt >= MAX_SUBTITLE_FILES) break; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1966 } |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1967 closedir(d); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1968 } |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1969 |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1970 } |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1971 |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1972 if (tmp_sub_id) free(tmp_sub_id); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1973 |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1974 free(f_dir); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1975 free(f_fname); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1976 free(f_fname_noext); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1977 free(f_fname_trim); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1978 |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1979 free(tmp_fname_noext); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1980 free(tmp_fname_trim); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1981 free(tmp_fname_ext); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1982 |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1983 free(tmpresult); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1984 |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1985 qsort(result, subcnt, sizeof(subfn), compare_sub_priority); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1986 |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1987 result2 = (char**)malloc(sizeof(char*)*(subcnt+1)); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1988 memset(result2, 0, sizeof(char*)*(subcnt+1)); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1989 |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1990 for (i = 0; i < subcnt; i++) { |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1991 result2[i] = result[i].fname; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1992 } |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1993 result2[subcnt] = NULL; |
| 10220 | 1994 |
| 1995 free(result); | |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1996 |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1997 return result2; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1998 } |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1999 |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2000 void list_sub_file(sub_data* subd){ |
| 1761 | 2001 int i,j; |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2002 subtitle *subs = subd->subtitles; |
| 1761 | 2003 |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2004 for(j=0; j < subd->sub_num; j++){ |
| 1761 | 2005 subtitle* egysub=&subs[j]; |
|
8862
356534b9e7d4
Since version 2.7 the file extension for JACOsub changed from
arpi
parents:
8789
diff
changeset
|
2006 printf ("%i line%c (%li-%li)\n", |
| 1761 | 2007 egysub->lines, |
| 2008 (1==egysub->lines)?' ':'s', | |
| 2009 egysub->start, | |
| 2010 egysub->end); | |
| 2011 for (i=0; i<egysub->lines; i++) { | |
|
8862
356534b9e7d4
Since version 2.7 the file extension for JACOsub changed from
arpi
parents:
8789
diff
changeset
|
2012 printf ("\t\t%d: %s%s", i,egysub->text[i], i==egysub->lines-1?"":" \n "); |
| 1761 | 2013 } |
| 2014 printf ("\n"); | |
| 2015 } | |
| 2016 | |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2017 printf ("Subtitle format %s time.\n", |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2018 subd->sub_uses_time ? "uses":"doesn't use"); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2019 printf ("Read %i subtitles, %i errors.\n", subd->sub_num, subd->sub_errs); |
| 1761 | 2020 } |
| 6208 | 2021 |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2022 void dump_srt(sub_data* subd, float fps){ |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2023 int i,j; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2024 int h,m,s,ms; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2025 FILE * fd; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2026 subtitle * onesub; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2027 unsigned long temp; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2028 subtitle *subs = subd->subtitles; |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2029 |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2030 if (!subd->sub_uses_time && sub_fps == 0) |
| 6792 | 2031 sub_fps = fps; |
| 6208 | 2032 fd=fopen("dumpsub.srt","w"); |
| 2033 if(!fd) | |
| 2034 { | |
| 2035 perror("dump_srt: fopen"); | |
| 2036 return; | |
| 2037 } | |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2038 for(i=0; i < subd->sub_num; i++) |
| 6208 | 2039 { |
| 2040 onesub=subs+i; //=&subs[i]; | |
| 2041 fprintf(fd,"%d\n",i+1);//line number | |
| 2042 | |
| 2043 temp=onesub->start; | |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2044 if (!subd->sub_uses_time) |
| 6792 | 2045 temp = temp * 100 / sub_fps; |
| 2046 temp -= sub_delay * 100; | |
| 6208 | 2047 h=temp/360000;temp%=360000; //h =1*100*60*60 |
| 2048 m=temp/6000; temp%=6000; //m =1*100*60 | |
| 2049 s=temp/100; temp%=100; //s =1*100 | |
| 6792 | 2050 ms=temp*10; //ms=1*10 |
| 6208 | 2051 fprintf(fd,"%02d:%02d:%02d,%03d --> ",h,m,s,ms); |
| 2052 | |
| 2053 temp=onesub->end; | |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2054 if (!subd->sub_uses_time) |
| 6792 | 2055 temp = temp * 100 / sub_fps; |
| 2056 temp -= sub_delay * 100; | |
| 6208 | 2057 h=temp/360000;temp%=360000; |
| 2058 m=temp/6000; temp%=6000; | |
| 2059 s=temp/100; temp%=100; | |
| 6792 | 2060 ms=temp*10; |
| 6208 | 2061 fprintf(fd,"%02d:%02d:%02d,%03d\n",h,m,s,ms); |
| 2062 | |
| 2063 for(j=0;j<onesub->lines;j++) | |
| 2064 fprintf(fd,"%s\n",onesub->text[j]); | |
| 2065 | |
| 2066 fprintf(fd,"\n"); | |
| 2067 } | |
| 2068 fclose(fd); | |
| 6296 | 2069 mp_msg(MSGT_SUBREADER,MSGL_INFO,"SUB: Subtitles dumped in \'dumpsub.srt\'.\n"); |
| 6208 | 2070 } |
| 1761 | 2071 |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2072 void dump_mpsub(sub_data* subd, float fps){ |
| 2178 | 2073 int i,j; |
| 2074 FILE *fd; | |
| 2075 float a,b; | |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2076 subtitle *subs = subd->subtitles; |
| 2178 | 2077 |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2078 mpsub_position = subd->sub_uses_time? (sub_delay*100) : (sub_delay*fps); |
| 4886 | 2079 if (sub_fps==0) sub_fps=fps; |
| 2178 | 2080 |
| 2081 fd=fopen ("dump.mpsub", "w"); | |
| 2082 if (!fd) { | |
| 2083 perror ("dump_mpsub: fopen"); | |
| 2084 return; | |
| 2085 } | |
| 2086 | |
| 2087 | |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2088 if (subd->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
|
2089 else fprintf (fd, "FORMAT=%5.2f\n\n", fps); |
| 2178 | 2090 |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2091 for(j=0; j < subd->sub_num; j++){ |
| 2495 | 2092 subtitle* egysub=&subs[j]; |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2093 if (subd->sub_uses_time) { |
| 2495 | 2094 a=((egysub->start-mpsub_position)/100.0); |
| 2095 b=((egysub->end-egysub->start)/100.0); | |
| 2096 if ( (float)((int)a) == a) | |
| 2097 fprintf (fd, "%.0f",a); | |
| 2098 else | |
| 2099 fprintf (fd, "%.2f",a); | |
| 2100 | |
| 2101 if ( (float)((int)b) == b) | |
| 2102 fprintf (fd, " %.0f\n",b); | |
| 2103 else | |
| 2104 fprintf (fd, " %.2f\n",b); | |
| 2105 } else { | |
| 4886 | 2106 fprintf (fd, "%ld %ld\n", (long)((egysub->start*(fps/sub_fps))-((mpsub_position*(fps/sub_fps)))), |
| 2107 (long)(((egysub->end)-(egysub->start))*(fps/sub_fps))); | |
| 2495 | 2108 } |
| 2109 | |
| 2110 mpsub_position = egysub->end; | |
| 2111 for (i=0; i<egysub->lines; i++) { | |
| 2112 fprintf (fd, "%s\n",egysub->text[i]); | |
| 2113 } | |
| 2114 fprintf (fd, "\n"); | |
| 2178 | 2115 } |
| 2116 fclose (fd); | |
| 6296 | 2117 mp_msg(MSGT_SUBREADER,MSGL_INFO,"SUB: Subtitles dumped in \'dump.mpsub\'.\n"); |
| 2178 | 2118 } |
| 2119 | |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2120 void dump_microdvd(sub_data* subd, float fps) { |
| 7460 | 2121 int i, delay; |
| 2122 FILE *fd; | |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2123 subtitle *subs = subd->subtitles; |
| 7460 | 2124 if (sub_fps == 0) |
| 2125 sub_fps = fps; | |
| 2126 fd = fopen("dumpsub.txt", "w"); | |
| 2127 if (!fd) { | |
| 2128 perror("dumpsub.txt: fopen"); | |
| 2129 return; | |
| 2130 } | |
| 2131 delay = sub_delay * sub_fps; | |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2132 for (i = 0; i < subd->sub_num; ++i) { |
| 7460 | 2133 int j, start, end; |
| 2134 start = subs[i].start; | |
| 2135 end = subs[i].end; | |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2136 if (subd->sub_uses_time) { |
| 7460 | 2137 start = start * sub_fps / 100 ; |
| 2138 end = end * sub_fps / 100; | |
| 2139 } | |
| 2140 else { | |
| 2141 start = start * sub_fps / fps; | |
| 2142 end = end * sub_fps / fps; | |
| 2143 } | |
| 2144 start -= delay; | |
| 2145 end -= delay; | |
| 2146 fprintf(fd, "{%d}{%d}", start, end); | |
| 2147 for (j = 0; j < subs[i].lines; ++j) | |
| 2148 fprintf(fd, "%s%s", j ? "|" : "", subs[i].text[j]); | |
| 2149 fprintf(fd, "\n"); | |
| 2150 } | |
| 2151 fclose(fd); | |
| 2152 mp_msg(MSGT_SUBREADER,MSGL_INFO,"SUB: Subtitles dumped in \'dumpsub.txt\'.\n"); | |
| 2153 } | |
| 2154 | |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2155 void dump_jacosub(sub_data* subd, float fps) { |
| 8360 | 2156 int i,j; |
| 2157 int h,m,s,cs; | |
| 2158 FILE * fd; | |
| 2159 subtitle * onesub; | |
| 2160 unsigned long temp; | |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2161 subtitle *subs = subd->subtitles; |
| 8360 | 2162 |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2163 if (!subd->sub_uses_time && sub_fps == 0) |
| 8360 | 2164 sub_fps = fps; |
|
8862
356534b9e7d4
Since version 2.7 the file extension for JACOsub changed from
arpi
parents:
8789
diff
changeset
|
2165 fd=fopen("dumpsub.jss","w"); |
| 8360 | 2166 if(!fd) |
| 2167 { | |
| 2168 perror("dump_jacosub: fopen"); | |
| 2169 return; | |
| 2170 } | |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2171 fprintf(fd, "#TIMERES %d\n", (subd->sub_uses_time) ? 100 : (int)sub_fps); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2172 for(i=0; i < subd->sub_num; i++) |
| 8360 | 2173 { |
| 2174 onesub=subs+i; //=&subs[i]; | |
| 2175 | |
| 2176 temp=onesub->start; | |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2177 if (!subd->sub_uses_time) |
| 8360 | 2178 temp = temp * 100 / sub_fps; |
| 2179 temp -= sub_delay * 100; | |
| 2180 h=temp/360000;temp%=360000; //h =1*100*60*60 | |
| 2181 m=temp/6000; temp%=6000; //m =1*100*60 | |
| 2182 s=temp/100; temp%=100; //s =1*100 | |
| 2183 cs=temp; //cs=1*10 | |
| 2184 fprintf(fd,"%02d:%02d:%02d.%02d ",h,m,s,cs); | |
| 2185 | |
| 2186 temp=onesub->end; | |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2187 if (!subd->sub_uses_time) |
| 8360 | 2188 temp = temp * 100 / sub_fps; |
| 2189 temp -= sub_delay * 100; | |
| 2190 h=temp/360000;temp%=360000; | |
| 2191 m=temp/6000; temp%=6000; | |
| 2192 s=temp/100; temp%=100; | |
| 2193 cs=temp; | |
| 2194 fprintf(fd,"%02d:%02d:%02d.%02d {~} ",h,m,s,cs); | |
| 2195 | |
| 2196 for(j=0;j<onesub->lines;j++) | |
| 2197 fprintf(fd,"%s%s",j ? "\\n" : "", onesub->text[j]); | |
| 2198 | |
| 2199 fprintf(fd,"\n"); | |
| 2200 } | |
| 2201 fclose(fd); | |
| 2202 mp_msg(MSGT_SUBREADER,MSGL_INFO,"SUB: Subtitles dumped in \'dumpsub.js\'.\n"); | |
| 2203 } | |
| 2204 | |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2205 void dump_sami(sub_data* subd, float fps) { |
| 8363 | 2206 int i,j; |
| 2207 FILE * fd; | |
| 2208 subtitle * onesub; | |
| 2209 unsigned long temp; | |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2210 subtitle *subs = subd->subtitles; |
| 8363 | 2211 |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2212 if (!subd->sub_uses_time && sub_fps == 0) |
| 8363 | 2213 sub_fps = fps; |
| 2214 fd=fopen("dumpsub.smi","w"); | |
| 2215 if(!fd) | |
| 2216 { | |
| 2217 perror("dump_jacosub: fopen"); | |
| 2218 return; | |
| 2219 } | |
| 2220 fprintf(fd, "<SAMI>\n" | |
| 2221 "<HEAD>\n" | |
| 2222 " <STYLE TYPE=\"Text/css\">\n" | |
| 2223 " <!--\n" | |
| 2224 " P {margin-left: 29pt; margin-right: 29pt; font-size: 24pt; text-align: center; font-family: Tahoma; font-weight: bold; color: #FCDD03; background-color: #000000;}\n" | |
| 2225 " .SUBTTL {Name: 'Subtitles'; Lang: en-US; SAMIType: CC;}\n" | |
| 2226 " -->\n" | |
| 2227 " </STYLE>\n" | |
| 2228 "</HEAD>\n" | |
| 2229 "<BODY>\n"); | |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2230 for(i=0; i < subd->sub_num; i++) |
| 8363 | 2231 { |
| 2232 onesub=subs+i; //=&subs[i]; | |
| 2233 | |
| 2234 temp=onesub->start; | |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2235 if (!subd->sub_uses_time) |
| 8363 | 2236 temp = temp * 100 / sub_fps; |
| 2237 temp -= sub_delay * 100; | |
| 2238 fprintf(fd,"\t<SYNC Start=%lu>\n" | |
| 2239 "\t <P>", temp * 10); | |
| 2240 | |
| 2241 for(j=0;j<onesub->lines;j++) | |
| 2242 fprintf(fd,"%s%s",j ? "<br>" : "", onesub->text[j]); | |
| 2243 | |
| 2244 fprintf(fd,"\n"); | |
| 2245 | |
| 2246 temp=onesub->end; | |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2247 if (!subd->sub_uses_time) |
| 8363 | 2248 temp = temp * 100 / sub_fps; |
| 2249 temp -= sub_delay * 100; | |
| 2250 fprintf(fd,"\t<SYNC Start=%lu>\n" | |
| 2251 "\t <P> \n", temp * 10); | |
| 2252 } | |
| 2253 fprintf(fd, "</BODY>\n" | |
| 2254 "</SAMI>\n"); | |
| 2255 fclose(fd); | |
| 2256 mp_msg(MSGT_SUBREADER,MSGL_INFO,"SUB: Subtitles dumped in \'dumpsub.smi\'.\n"); | |
| 2257 } | |
| 2258 | |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2259 void sub_free( sub_data * subd ) |
| 3543 | 2260 { |
| 2261 int i; | |
| 2262 | |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2263 if ( !subd ) return; |
| 3543 | 2264 |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2265 if (subd->subtitles) { |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2266 for (i=0; i < subd->subtitles->lines; i++) free( subd->subtitles->text[i] ); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2267 free( subd->subtitles ); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2268 } |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2269 if (subd->filename) free( subd->filename ); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2270 free( subd ); |
| 3543 | 2271 } |
| 2178 | 2272 |
|
2449
7ef89d9b06ed
added DUMPSUBS recognition if we need compile only subreader.c alone
atlka
parents:
2358
diff
changeset
|
2273 #ifdef DUMPSUBS |
| 258 | 2274 int main(int argc, char **argv) { // for testing |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2275 sub_data *subd; |
| 258 | 2276 |
| 2277 if(argc<2){ | |
| 2278 printf("\nUsage: subreader filename.sub\n\n"); | |
| 2279 exit(1); | |
| 2280 } | |
|
2449
7ef89d9b06ed
added DUMPSUBS recognition if we need compile only subreader.c alone
atlka
parents:
2358
diff
changeset
|
2281 sub_cp = argv[2]; |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2282 subd = sub_read_file(argv[1]); |
|
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2283 if(!subd){ |
| 4886 | 2284 printf("Couldn't load file.\n"); |
| 258 | 2285 exit(1); |
| 2286 } | |
| 1761 | 2287 |
|
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2288 list_sub_file(subd); |
| 258 | 2289 |
| 2290 return 0; | |
| 2291 } | |
|
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
2292 #endif |
