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 = content->position() + DCPTime::from_frames (offset_from_start, _film->video_frame_rate());
+ auto const from = content->position() + DCPTime::from_frames(offset_from_start, ffr);
if (dcp->reference_video()) {
maybe_add_asset (reel_assets, reel->main_picture(), reel_trim_start, reel_trim_end, from, ffr);
}
}
if (dcp->reference_text(TextType::CLOSED_CAPTION)) {
- for (auto l: reel->closed_captions()) {
- maybe_add_asset (reel_assets, l, reel_trim_start, reel_trim_end, from, ffr);
+ for (auto caption: reel->closed_captions()) {
+ maybe_add_asset (reel_assets, caption, reel_trim_start, reel_trim_end, from, ffr);
}
}