Adapt for libdcp use of enum class.

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

diff --git a/src/lib/text_decoder.cc b/src/lib/text_decoder.cc
index 28dace7afbcf656c8827e3382d8f732fe4c6e65d..099e3ee74e34af098188c8e3c8b6b51111c03f74 100644 (file)
--- a/src/lib/text_decoder.cc
+++ b/src/lib/text_decoder.cc
@@ -24,8 +24,6 @@
 #include "log.h"
 #include "compose.hpp"
 #include <sub/subtitle.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/foreach.hpp>
 #include <boost/algorithm/string.hpp>
 #include <iostream>
 
@@ -34,7 +32,7 @@ using std::cout;
 using std::string;
 using std::min;
 using std::max;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
 using boost::function;
 using namespace dcpomatic;
@@ -68,7 +66,7 @@ TextDecoder::emit_bitmap_start (ContentTime from, shared_ptr<Image> image, dcpom
 void
 TextDecoder::emit_plain_start (ContentTime from, list<dcp::SubtitleString> s)
 {
-       BOOST_FOREACH (dcp::SubtitleString& i, s) {
+       for (auto& i: s) {
                /* We must escape < and > in strings, otherwise they might confuse our subtitle
                   renderer (which uses some HTML-esque markup to do bold/italic etc.)
                */
@@ -105,7 +103,7 @@ TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & subtitle)
        /* See if our next subtitle needs to be vertically placed on screen by us */
        bool needs_placement = false;
        optional<int> bottom_line;
-       BOOST_FOREACH (sub::Line i, subtitle.lines) {
+       for (auto i: subtitle.lines) {
                if (!i.vertical_position.reference || (i.vertical_position.line && !i.vertical_position.lines) || i.vertical_position.reference.get() == sub::TOP_OF_SUBTITLE) {
                        needs_placement = true;
                        if (!bottom_line || bottom_line.get() < i.vertical_position.line.get()) {
@@ -116,7 +114,7 @@ TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & subtitle)
 
        /* Find the lowest proportional position */
        optional<float> lowest_proportional;
-       BOOST_FOREACH (sub::Line i, subtitle.lines) {
+       for (auto i: subtitle.lines) {
                if (i.vertical_position.proportional) {
                        if (!lowest_proportional) {
                                lowest_proportional = i.vertical_position.proportional;
@@ -127,8 +125,8 @@ TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & subtitle)
        }
 
        list<dcp::SubtitleString> out;
-       BOOST_FOREACH (sub::Line i, subtitle.lines) {
-               BOOST_FOREACH (sub::Block j, i.blocks) {
+       for (auto i: subtitle.lines) {
+               for (auto j: i.blocks) {
 
                        if (!j.font_size.specified()) {
                                /* Fallback default font size if no other has been specified */
@@ -139,14 +137,28 @@ TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & subtitle)
                        dcp::VAlign v_align;
                        if (needs_placement) {
                                DCPOMATIC_ASSERT (i.vertical_position.line);
-                               /* This 1.015 is an arbitrary value to lift the bottom sub off the bottom
-                                  of the screen a bit to a pleasing degree.
-                               */
-                               v_position = 1.015 -
-                                       (1 + bottom_line.get() - i.vertical_position.line.get())
-                                       * 1.2 * content()->line_spacing() * content()->y_scale() * j.font_size.proportional (72 * 11);
+                               double const multiplier = 1.2 * content()->line_spacing() * content()->y_scale() * j.font_size.proportional (72 * 11);
+                               switch (i.vertical_position.reference.get_value_or(sub::BOTTOM_OF_SCREEN)) {
+                               case sub::BOTTOM_OF_SCREEN:
+                               case sub::TOP_OF_SUBTITLE:
+                                       /* This 1.015 is an arbitrary value to lift the bottom sub off the bottom
+                                          of the screen a bit to a pleasing degree.
+                                          */
+                                       v_position = 1.015 -
+                                               (1 + bottom_line.get() - i.vertical_position.line.get()) * multiplier;
 
-                               v_align = dcp::VALIGN_TOP;
+                                       v_align = dcp::VAlign::TOP;
+                                       break;
+                               case sub::TOP_OF_SCREEN:
+                                       /* This 0.1 is another fudge factor to bring the top line away from the top of the screen a little */
+                                       v_position = 0.12 + i.vertical_position.line.get() * multiplier;
+                                       v_align = dcp::VAlign::TOP;
+                                       break;
+                               case sub::VERTICAL_CENTRE_OF_SCREEN:
+                                       v_position = i.vertical_position.line.get() * multiplier;
+                                       v_align = dcp::VAlign::CENTER;
+                                       break;
+                               }
                        } else {
                                DCPOMATIC_ASSERT (i.vertical_position.reference);
                                if (i.vertical_position.proportional) {
@@ -164,16 +176,16 @@ TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & subtitle)
 
                                switch (i.vertical_position.reference.get()) {
                                case sub::TOP_OF_SCREEN:
-                                       v_align = dcp::VALIGN_TOP;
+                                       v_align = dcp::VAlign::TOP;
                                        break;
                                case sub::VERTICAL_CENTRE_OF_SCREEN:
-                                       v_align = dcp::VALIGN_CENTER;
+                                       v_align = dcp::VAlign::CENTER;
                                        break;
                                case sub::BOTTOM_OF_SCREEN:
-                                       v_align = dcp::VALIGN_BOTTOM;
+                                       v_align = dcp::VAlign::BOTTOM;
                                        break;
                                default:
-                                       v_align = dcp::VALIGN_TOP;
+                                       v_align = dcp::VAlign::TOP;
                                        break;
                                }
                        }
@@ -182,18 +194,18 @@ TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & subtitle)
                        float h_position = i.horizontal_position.proportional;
                        switch (i.horizontal_position.reference) {
                        case sub::LEFT_OF_SCREEN:
-                               h_align = dcp::HALIGN_LEFT;
+                               h_align = dcp::HAlign::LEFT;
                                h_position = max(h_position, 0.05f);
                                break;
                        case sub::HORIZONTAL_CENTRE_OF_SCREEN:
-                               h_align = dcp::HALIGN_CENTER;
+                               h_align = dcp::HAlign::CENTER;
                                break;
                        case sub::RIGHT_OF_SCREEN:
-                               h_align = dcp::HALIGN_RIGHT;
+                               h_align = dcp::HAlign::RIGHT;
                                h_position = max(h_position, 0.05f);
                                break;
                        default:
-                               h_align = dcp::HALIGN_CENTER;
+                               h_align = dcp::HAlign::CENTER;
                                break;
                        }
 
@@ -218,9 +230,9 @@ TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & subtitle)
                                        h_align,
                                        v_position,
                                        v_align,
-                                       dcp::DIRECTION_LTR,
+                                       dcp::Direction::LTR,
                                        j.text,
-                                       dcp::NONE,
+                                       dcp::Effect::NONE,
                                        j.effect_colour.get_value_or(sub::Colour(0, 0, 0)).dcp(),
                                        /* Hack: we should use subtitle.fade_up and subtitle.fade_down here
                                           but the times of these often don't have a frame rate associated