- for (list<SubRipSubtitlePiece>::const_iterator i = _subtitles[_next].pieces.begin(); i != _subtitles[_next].pieces.end(); ++i) {
- out.push_back (
- dcp::SubtitleString (
- "Arial",
- i->italic,
- dcp::Color (255, 255, 255),
- 72,
- dcp::Time (rint (_subtitles[_next].from.seconds() * 250)),
- dcp::Time (rint (_subtitles[_next].to.seconds() * 250)),
- 0.9,
- dcp::BOTTOM,
- i->text,
- dcp::NONE,
- dcp::Color (255, 255, 255),
- 0,
- 0
- )
- );
+
+ /* Highest line index in this subtitle */
+ int highest = 0;
+ BOOST_FOREACH (sub::Line i, _subtitles[_next].lines) {
+ DCPOMATIC_ASSERT (i.vertical_position.reference && i.vertical_position.reference.get() == sub::TOP_OF_SUBTITLE);
+ DCPOMATIC_ASSERT (i.vertical_position.line);
+ highest = max (highest, i.vertical_position.line.get());
+ }
+
+ BOOST_FOREACH (sub::Line i, _subtitles[_next].lines) {
+ BOOST_FOREACH (sub::Block j, i.blocks) {
+ out.push_back (
+ dcp::SubtitleString (
+ SubRipContent::font_id,
+ j.italic,
+ /* force the colour to whatever is configured */
+ content->colour(),
+ j.font_size.points (72 * 11),
+ 1.0,
+ dcp::Time (_subtitles[_next].from.all_as_seconds(), 1000),
+ dcp::Time (_subtitles[_next].to.all_as_seconds(), 1000),
+ 0,
+ dcp::HALIGN_CENTER,
+ /* This 1.015 is an arbitrary value to lift the bottom sub off the bottom
+ of the screen a bit to a pleasing degree.
+ */
+ 1.015 - ((1 + highest - i.vertical_position.line.get()) * 1.5 / 22),
+ dcp::VALIGN_TOP,
+ j.text,
+ content->outline() ? dcp::BORDER : dcp::NONE,
+ content->outline_colour(),
+ dcp::Time (0, 1000),
+ dcp::Time (0, 1000)
+ )
+ );
+ }