summaryrefslogtreecommitdiff
path: root/src/lib/player.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-08-22 19:58:23 +0100
committerCarl Hetherington <cth@carlh.net>2018-08-22 19:58:23 +0100
commitb626119b67727f986339203a8a34a4c843fbf068 (patch)
tree764348aee843526ce0a3e8f76fe94e177107bce3 /src/lib/player.cc
parent429c5c9491151aa95a9a61abd5956bd6cebd4a1f (diff)
Fix build with multiple closed captions.
Diffstat (limited to 'src/lib/player.cc')
-rw-r--r--src/lib/player.cc15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc
index ce6912f0b..1e543fe1f 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -541,13 +541,14 @@ Player::get_reel_assets ()
}
if (j->reference_text (TEXT_CLOSED_CAPTION)) {
- shared_ptr<dcp::ReelAsset> ra = k->closed_caption ();
- DCPOMATIC_ASSERT (ra);
- ra->set_entry_point (ra->entry_point() + trim_start);
- ra->set_duration (ra->duration() - trim_start - trim_end);
- a.push_back (
- ReferencedReelAsset (ra, DCPTimePeriod (from, from + DCPTime::from_frames (ra->duration(), ffr)))
- );
+ BOOST_FOREACH (shared_ptr<dcp::ReelClosedCaptionAsset> l, k->closed_captions()) {
+ DCPOMATIC_ASSERT (l);
+ l->set_entry_point (l->entry_point() + trim_start);
+ l->set_duration (l->duration() - trim_start - trim_end);
+ a.push_back (
+ ReferencedReelAsset (l, DCPTimePeriod (from, from + DCPTime::from_frames (l->duration(), ffr)))
+ );
+ }
}
/* Assume that main picture duration is the length of the reel */