Support new libdcp with subtitle direction.

diff --git a/cscript b/cscript
index 55b62a2486b2a33acaebd224ae2db2b33186d867..aa622e27f9129969cd7c84fd2c2475e26e3d0559 100644 (file)
--- a/cscript
+++ b/cscript
@@ -262,7 +262,7 @@ def dependencies(target):
         ffmpeg_options = {}
 
     return (('ffmpeg-cdist', 'f2952f3', ffmpeg_options),
-            ('libdcp', '42f74b7'),
+            ('libdcp', '4b8c626'),
             ('libsub', 'b9fb00d'))
 
 def configure_options(target):

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index bfc3b6132ba6e667bece3f388d8d58640cfd061f..e5e1f04ac428e4e23671febf874679f75da5fe68 100644 (file)
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -598,6 +598,7 @@ FFmpegDecoder::decode_ass_subtitle (string ass, ContentTimePeriod period)
                                                */
                                                1.015 - ((1 + highest - j.vertical_position.line.get()) * 1.5 / 22),
                                                dcp::VALIGN_TOP,
+                                               dcp::DIRECTION_LTR,
                                                k.text,
                                                static_cast<dcp::Effect> (0),
                                                dcp::Colour (255, 255, 255),

diff --git a/src/lib/text_subtitle_content.h b/src/lib/text_subtitle_content.h
index 52d44ae54fce7c47918c60cc93642016db8d7937..ad63a0e7d7f13558489b8a8d6ea9ad505caff87b 100644 (file)
--- a/src/lib/text_subtitle_content.h
+++ b/src/lib/text_subtitle_content.h
@@ -27,7 +27,9 @@ public:
        static int const TEXT_SUBTITLE_OUTLINE_COLOUR;
 };
 
-
+/** @class TextSubtitleContent
+ *  @brief SubRip or SSA subtitles.
+ */
 class TextSubtitleContent : public SubtitleContent
 {
 public:

diff --git a/src/lib/text_subtitle_decoder.cc b/src/lib/text_subtitle_decoder.cc
index b40f830688099b56fb92eaf14d9ee7e3c47112b1..c94a002f550bdec8f0cc73ac399261178289c145 100644 (file)
--- a/src/lib/text_subtitle_decoder.cc
+++ b/src/lib/text_subtitle_decoder.cc
@@ -93,6 +93,7 @@ TextSubtitleDecoder::pass (PassReason, bool)
                                        */
                                        1.015 - ((1 + highest - i.vertical_position.line.get()) * 1.5 / 22),
                                        dcp::VALIGN_TOP,
+                                       dcp::DIRECTION_LTR,
                                        j.text,
                                        content->outline() ? dcp::BORDER : dcp::NONE,
                                        content->outline_colour(),