From: Carl Hetherington <cth@carlh.net>
Date: Wed, 31 Jan 2018 01:07:51 +0000 (+0000)
Subject: Fix duration/intrinsic duration confusion.
X-Git-Tag: v2.11.46~1
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=b6a10d403b671c0b0e4c9faeab52e62ba1ac3c5a

Fix duration/intrinsic duration confusion.
---

diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index 4aa5ff3a7..da246ca0a 100644
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -458,10 +458,12 @@ ReelWriter::create_reel (list<ReferencedReelAsset> const & refs, list<shared_ptr
 		} else {
 
 			/* All our assets should be the same length; use the picture asset length here
-			   as a reference to set the subtitle one.
+			   as a reference to set the subtitle one.  We'll use the duration rather than
+			   the intrinsic duration; we don't care if the picture asset has been trimmed, we're
+			   just interested in its presentation length.
 			*/
 			dynamic_pointer_cast<dcp::SMPTESubtitleAsset>(_subtitle_asset)->set_intrinsic_duration (
-				reel_picture_asset->intrinsic_duration ()
+				reel_picture_asset->duration ()
 				);
 
 			_subtitle_asset->write (
@@ -473,7 +475,7 @@ ReelWriter::create_reel (list<ReferencedReelAsset> const & refs, list<shared_ptr
 			new dcp::ReelSubtitleAsset (
 				_subtitle_asset,
 				dcp::Fraction (_film->video_frame_rate(), 1),
-				reel_picture_asset->intrinsic_duration (),
+				reel_picture_asset->duration(),
 				0
 				)
 			);