Support binary STL subtitle files.

[dcpomatic.git] / src / lib / text_decoder.cc

diff --git a/src/lib/text_decoder.cc b/src/lib/text_decoder.cc
index 74fea6ec309d937243f5157ba6ab7a50afdada06..1e13bb3c98322c14bb8d32a0ca1063c9fc0eedca 100644 (file)
--- a/src/lib/text_decoder.cc
+++ b/src/lib/text_decoder.cc
@@ -147,9 +147,14 @@ TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & subtitle)
 
                                v_align = dcp::VALIGN_TOP;
                        } else {
 
                                v_align = dcp::VALIGN_TOP;
                        } else {

-                               DCPOMATIC_ASSERT (i.vertical_position.proportional);

                                DCPOMATIC_ASSERT (i.vertical_position.reference);
                                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 */
 
                                if (lowest_proportional) {
                                        /* Adjust line spacing */