X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftext_decoder.cc;h=0a7bdf95da75ffc32f428d095929d8b891bb4b0d;hb=8963f0007af1a312017b9627c18b82ec2a577591;hp=a2241c50b4f9f0b630ae1ed623b28b34f60a383d;hpb=a5d004b0773f633401528392fc28e66d70e13ac8;p=dcpomatic.git

diff --git a/src/lib/text_decoder.cc b/src/lib/text_decoder.cc
index a2241c50b..0a7bdf95d 100644
--- a/src/lib/text_decoder.cc
+++ b/src/lib/text_decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,6 +18,7 @@
 
 */
 
+
 #include "text_decoder.h"
 #include "text_content.h"
 #include "util.h"
@@ -27,6 +28,7 @@
 #include <boost/algorithm/string.hpp>
 #include <iostream>
 
+
 using std::list;
 using std::cout;
 using std::string;
@@ -34,9 +36,10 @@ using std::min;
 using std::max;
 using std::shared_ptr;
 using boost::optional;
-using boost::function;
+using std::function;
 using namespace dcpomatic;
 
+
 TextDecoder::TextDecoder (
 	Decoder* parent,
 	shared_ptr<const TextContent> c,
@@ -49,6 +52,7 @@ TextDecoder::TextDecoder (
 
 }
 
+
 /** Called by subclasses when an image subtitle is starting.
  *  @param from From time of the subtitle.
  *  @param image Subtitle image.
@@ -63,6 +67,7 @@ TextDecoder::emit_bitmap_start (ContentTime from, shared_ptr<Image> image, dcpom
 	_position = from;
 }
 
+
 void
 TextDecoder::emit_plain_start (ContentTime from, list<dcp::SubtitleString> s)
 {
@@ -97,6 +102,7 @@ TextDecoder::emit_plain_start (ContentTime from, list<dcp::SubtitleString> s)
 	_position = from;
 }
 
+
 void
 TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & subtitle)
 {
@@ -147,16 +153,16 @@ TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & subtitle)
 					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;
+					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;
+					v_align = dcp::VAlign::CENTER;
 					break;
 				}
 			} else {
@@ -176,16 +182,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;
 				}
 			}
@@ -194,18 +200,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;
 			}
 
@@ -230,9 +236,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
@@ -250,12 +256,14 @@ TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & subtitle)
 	emit_plain_start (from, out);
 }
 
+
 void
 TextDecoder::emit_stop (ContentTime to)
 {
 	Stop (to);
 }
 
+
 void
 TextDecoder::emit_plain (ContentTimePeriod period, list<dcp::SubtitleString> s)
 {
@@ -263,6 +271,7 @@ TextDecoder::emit_plain (ContentTimePeriod period, list<dcp::SubtitleString> s)
 	emit_stop (period.to);
 }
 
+
 void
 TextDecoder::emit_plain (ContentTimePeriod period, sub::Subtitle const & s)
 {
@@ -270,6 +279,7 @@ TextDecoder::emit_plain (ContentTimePeriod period, sub::Subtitle const & s)
 	emit_stop (period.to);
 }
 
+
 /*  @param rect Area expressed as a fraction of the video frame that this subtitle
  *  is for (e.g. a width of 0.5 means the width of the subtitle is half the width
  *  of the video frame)
@@ -281,6 +291,7 @@ TextDecoder::emit_bitmap (ContentTimePeriod period, shared_ptr<Image> image, dcp
 	emit_stop (period.to);
 }
 
+
 void
 TextDecoder::seek ()
 {