summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-02-15 23:13:38 +0000
committerCarl Hetherington <cth@carlh.net>2016-02-15 23:18:34 +0000
commit0b03fa4a894012febb367f9fb7ed58d9fc89b441 (patch)
tree98be57ad063ff594719ad8c950e69f339a6b759b /src
parent699606a3e775806d7375d06ec10791f5b54ad526 (diff)
Ignore newlines in SSA lines.
Diffstat (limited to 'src')
-rw-r--r--src/ssa_reader.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/ssa_reader.cc b/src/ssa_reader.cc
index e1ab0f7..b56d429 100644
--- a/src/ssa_reader.cc
+++ b/src/ssa_reader.cc
@@ -156,6 +156,8 @@ SSAReader::parse_line (RawSubtitle base, string line)
string style;
current.vertical_position.line = 0;
+ /* XXX: arbitrary */
+ current.vertical_position.lines = 32;
current.vertical_position.reference = TOP_OF_SUBTITLE;
for (size_t i = 0; i < line.length(); ++i) {
@@ -166,7 +168,7 @@ SSAReader::parse_line (RawSubtitle base, string line)
state = STYLE;
} else if (c == '\\') {
state = BACKSLASH;
- } else {
+ } else if (c != '\r' && c != '\n') {
current.text += c;
}
break;