X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=5404dfac4bd3fb9d51b721e83669c5ff0cbc8e1a;hb=244ddf0fc0b6466618408fec7b926f517be067c1;hp=0782df9da3351a982cc23eb6d8ece2b96f4f3185;hpb=7eed4fb3d35f0fb53bf877bfa5ddbefe4b2d20ed;p=dcpomatic.git

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 0782df9da..5404dfac4 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -559,59 +559,59 @@ Player::get_reel_assets ()
 
 	list<ReferencedReelAsset> reel_assets;
 
-	for (auto i: playlist()->content()) {
-		auto j = dynamic_pointer_cast<DCPContent> (i);
-		if (!j) {
+	for (auto content: playlist()->content()) {
+		auto dcp = dynamic_pointer_cast<DCPContent>(content);
+		if (!dcp) {
 			continue;
 		}
 
 		scoped_ptr<DCPDecoder> decoder;
 		try {
-			decoder.reset (new DCPDecoder(_film, j, false, false, shared_ptr<DCPDecoder>()));
+			decoder.reset (new DCPDecoder(_film, dcp, false, false, shared_ptr<DCPDecoder>()));
 		} catch (...) {
 			return reel_assets;
 		}
 
-		DCPOMATIC_ASSERT (j->video_frame_rate ());
-		double const cfr = j->video_frame_rate().get();
-		Frame const trim_start = j->trim_start().frames_round (cfr);
-		Frame const trim_end = j->trim_end().frames_round (cfr);
+		DCPOMATIC_ASSERT (dcp->video_frame_rate());
+		double const cfr = dcp->video_frame_rate().get();
+		Frame const trim_start = dcp->trim_start().frames_round(cfr);
+		Frame const trim_end = dcp->trim_end().frames_round(cfr);
 		int const ffr = _film->video_frame_rate ();
 
 		/* position in the asset from the start */
 		int64_t offset_from_start = 0;
-		/* position in the asset from the end */
+		/* position i the asset from the end */
 		int64_t offset_from_end = 0;
 		for (auto k: decoder->reels()) {
 			/* Assume that main picture duration is the length of the reel */
 			offset_from_end += k->main_picture()->actual_duration();
 		}
 
-		for (auto k: decoder->reels()) {
+		for (auto reel: decoder->reels()) {
 
 			/* Assume that main picture duration is the length of the reel */
-			int64_t const reel_duration = k->main_picture()->actual_duration();
+			int64_t const reel_duration = reel->main_picture()->actual_duration();
 
 			/* See doc/design/trim_reels.svg */
 			Frame const reel_trim_start = min(reel_duration, max(int64_t(0), trim_start - offset_from_start));
 			Frame const reel_trim_end =   min(reel_duration, max(int64_t(0), reel_duration - (offset_from_end - trim_end)));
 
-			auto const from = i->position() + DCPTime::from_frames (offset_from_start, _film->video_frame_rate());
-			if (j->reference_video ()) {
-				maybe_add_asset (reel_assets, k->main_picture(), reel_trim_start, reel_trim_end, from, ffr);
+			auto const from = max(DCPTime(), content->position() + DCPTime::from_frames(offset_from_start, ffr) - DCPTime::from_frames(trim_start, cfr));
+			if (dcp->reference_video()) {
+				maybe_add_asset (reel_assets, reel->main_picture(), reel_trim_start, reel_trim_end, from, ffr);
 			}
 
-			if (j->reference_audio ()) {
-				maybe_add_asset (reel_assets, k->main_sound(), reel_trim_start, reel_trim_end, from, ffr);
+			if (dcp->reference_audio()) {
+				maybe_add_asset (reel_assets, reel->main_sound(), reel_trim_start, reel_trim_end, from, ffr);
 			}
 
-			if (j->reference_text (TextType::OPEN_SUBTITLE)) {
-				maybe_add_asset (reel_assets, k->main_subtitle(), reel_trim_start, reel_trim_end, from, ffr);
+			if (dcp->reference_text(TextType::OPEN_SUBTITLE)) {
+				maybe_add_asset (reel_assets, reel->main_subtitle(), reel_trim_start, reel_trim_end, from, ffr);
 			}
 
-			if (j->reference_text (TextType::CLOSED_CAPTION)) {
-				for (auto l: k->closed_captions()) {
-					maybe_add_asset (reel_assets, l, reel_trim_start, reel_trim_end, from, ffr);
+			if (dcp->reference_text(TextType::CLOSED_CAPTION)) {
+				for (auto caption: reel->closed_captions()) {
+					maybe_add_asset (reel_assets, caption, reel_trim_start, reel_trim_end, from, ffr);
 				}
 			}