diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-04-12 02:22:02 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-04-12 02:22:02 +0100 |
| commit | 4557d71347d597ddd4a1b5bc04776ffe3c3f3483 (patch) | |
| tree | 705f54b68f12416774d128dd392548f22aab0c96 /src/lib | |
| parent | d8e0660d716654c4ac0a1aa5a5ae15e46d4d2883 (diff) | |
Support new libdcp with subtitle direction.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/ffmpeg_decoder.cc | 1 | ||||
| -rw-r--r-- | src/lib/text_subtitle_content.h | 4 | ||||
| -rw-r--r-- | src/lib/text_subtitle_decoder.cc | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index bfc3b6132..e5e1f04ac 100644 --- 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 52d44ae54..ad63a0e7d 100644 --- 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 b40f83068..c94a002f5 100644 --- 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(), |