projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
7eed4fb
)
Cleanup variable name: i -> content
author
Carl Hetherington
<cth@carlh.net>
Tue, 2 Nov 2021 13:13:22 +0000
(14:13 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Tue, 2 Nov 2021 13:56:37 +0000
(14:56 +0100)
src/lib/player.cc
patch
|
blob
|
history
diff --git
a/src/lib/player.cc
b/src/lib/player.cc
index 0782df9da3351a982cc23eb6d8ece2b96f4f3185..49724f73b3623949c420d72c5a1565831a07b609 100644
(file)
--- a/
src/lib/player.cc
+++ b/
src/lib/player.cc
@@
-559,8
+559,8
@@
Player::get_reel_assets ()
list<ReferencedReelAsset> reel_assets;
list<ReferencedReelAsset> reel_assets;
- for (auto
i
: playlist()->content()) {
- auto j = dynamic_pointer_cast<DCPContent>
(i
);
+ for (auto
content
: playlist()->content()) {
+ auto j = dynamic_pointer_cast<DCPContent>
(content
);
if (!j) {
continue;
}
if (!j) {
continue;
}
@@
-596,7
+596,7
@@
Player::get_reel_assets ()
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)));
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());
+ auto const from =
content
->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);
}
if (j->reference_video ()) {
maybe_add_asset (reel_assets, k->main_picture(), reel_trim_start, reel_trim_end, from, ffr);
}