From e755db433d8d74854c1c65690261adbcf377ca11 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 27 Nov 2015 20:52:16 +0000 Subject: Fix incorrect multi-reel subtitle timings (#760) and add test. --- src/lib/reel_writer.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc index c8d848933..d9870ec6f 100644 --- a/src/lib/reel_writer.cc +++ b/src/lib/reel_writer.cc @@ -484,7 +484,9 @@ ReelWriter::write (PlayerSubtitles subs) } } - for (list::const_iterator i = subs.text.begin(); i != subs.text.end(); ++i) { - _subtitle_asset->add (*i); + BOOST_FOREACH (dcp::SubtitleString i, subs.text) { + i.set_in (i.in() - dcp::Time (_period.from.seconds(), i.in().tcr)); + i.set_out (i.out() - dcp::Time (_period.from.seconds(), i.out().tcr)); + _subtitle_asset->add (i); } } -- cgit v1.2.3