diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-11-02 14:18:15 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-11-04 11:45:11 +0100 |
| commit | 405d44808cff91b531818309c4be2041d2279bf5 (patch) | |
| tree | 770617545469c26c4150e98941b956421aefaa89 /src/lib | |
| parent | 16dbc2de1ce97770d6ba223e4968ba352511ca68 (diff) | |
Cleanup variable name: k -> reel
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/player.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc index 5a9c44932..a1ddd07ba 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -587,10 +587,10 @@ Player::get_reel_assets () 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)); @@ -598,19 +598,19 @@ Player::get_reel_assets () auto const from = content->position() + DCPTime::from_frames (offset_from_start, _film->video_frame_rate()); if (dcp->reference_video()) { - maybe_add_asset (reel_assets, k->main_picture(), reel_trim_start, reel_trim_end, from, ffr); + maybe_add_asset (reel_assets, reel->main_picture(), reel_trim_start, reel_trim_end, from, ffr); } if (dcp->reference_audio()) { - maybe_add_asset (reel_assets, k->main_sound(), reel_trim_start, reel_trim_end, from, ffr); + maybe_add_asset (reel_assets, reel->main_sound(), reel_trim_start, reel_trim_end, from, ffr); } if (dcp->reference_text(TextType::OPEN_SUBTITLE)) { - maybe_add_asset (reel_assets, k->main_subtitle(), reel_trim_start, reel_trim_end, from, ffr); + maybe_add_asset (reel_assets, reel->main_subtitle(), reel_trim_start, reel_trim_end, from, ffr); } if (dcp->reference_text(TextType::CLOSED_CAPTION)) { - for (auto l: k->closed_captions()) { + for (auto l: reel->closed_captions()) { maybe_add_asset (reel_assets, l, reel_trim_start, reel_trim_end, from, ffr); } } |