projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add another .srt test; remove checking of .srt subtitle indices as the strict sequenc...
[dcpomatic.git]
/
src
/
lib
/
subrip.cc
diff --git
a/src/lib/subrip.cc
b/src/lib/subrip.cc
index 11ad3302d3659abf107eed8b8fa69d33d8109c69..6c9cef91655c9fe83efce7724c781196ab6aff13 100644
(file)
--- a/
src/lib/subrip.cc
+++ b/
src/lib/subrip.cc
@@
-49,20
+49,19
@@
SubRip::SubRip (shared_ptr<const SubRipContent> content)
} state = COUNTER;
char buffer[256];
} state = COUNTER;
char buffer[256];
- int next_count = 1;
boost::optional<SubRipSubtitle> current;
list<string> lines;
boost::optional<SubRipSubtitle> current;
list<string> lines;
-
+
while (!feof (f)) {
fgets (buffer, sizeof (buffer), f);
if (feof (f)) {
break;
}
while (!feof (f)) {
fgets (buffer, sizeof (buffer), f);
if (feof (f)) {
break;
}
-
+
string line (buffer);
trim_right_if (line, boost::is_any_of ("\n\r"));
string line (buffer);
trim_right_if (line, boost::is_any_of ("\n\r"));
-
+
switch (state) {
case COUNTER:
{
switch (state) {
case COUNTER:
{
@@
-70,21
+69,9
@@
SubRip::SubRip (shared_ptr<const SubRipContent> content)
/* a blank line at the start is ok */
break;
}
/* a blank line at the start is ok */
break;
}
-
- int x = 0;
- try {
- x = lexical_cast<int> (line);
- } catch (...) {
- }
-
- if (x == next_count) {
- state = METADATA;
- ++next_count;
- current = SubRipSubtitle ();
- } else {
- throw SubRipError (line, _("a subtitle count"), content->path (0));
- }
+ state = METADATA;
+ current = SubRipSubtitle ();
}
break;
case METADATA:
}
break;
case METADATA: