summaryrefslogtreecommitdiff
path: root/src/lib/text_decoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-01-23 15:37:37 +0100
committerCarl Hetherington <cth@carlh.net>2020-01-24 22:14:44 +0100
commit3ce4c624eadab42d740b08d60d52bd0d4f2b86f6 (patch)
tree55a6944d2ee6a9e9999e9ee964147d3287b2b82e /src/lib/text_decoder.cc
parentf10e025eba54b0ab4dbe1b3611071b160ca89208 (diff)
Support binary STL subtitle files.
Diffstat (limited to 'src/lib/text_decoder.cc')
-rw-r--r--src/lib/text_decoder.cc9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/lib/text_decoder.cc b/src/lib/text_decoder.cc
index 4eaaf37af..4e2432463 100644
--- a/src/lib/text_decoder.cc
+++ b/src/lib/text_decoder.cc
@@ -148,9 +148,14 @@ TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & subtitle)
v_align = dcp::VALIGN_TOP;
} else {
- DCPOMATIC_ASSERT (i.vertical_position.proportional);
DCPOMATIC_ASSERT (i.vertical_position.reference);
- v_position = i.vertical_position.proportional.get();
+ if (i.vertical_position.proportional) {
+ v_position = i.vertical_position.proportional.get();
+ } else {
+ DCPOMATIC_ASSERT (i.vertical_position.line);
+ DCPOMATIC_ASSERT (i.vertical_position.lines);
+ v_position = float(*i.vertical_position.line) / *i.vertical_position.lines;
+ }
if (lowest_proportional) {
/* Adjust line spacing */