summaryrefslogtreecommitdiff
path: root/src/lib/player.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-09-30 09:33:33 +0100
committerCarl Hetherington <cth@carlh.net>2014-09-30 20:38:12 +0100
commita4d8e5d24beddb719180e75f1047ae317bef85a4 (patch)
tree9884019a61aabfc0658d16e29cfd6a4b4a21c485 /src/lib/player.cc
parent391d85619ac19a2a93696ddc35c222eb9bb5d9d6 (diff)
Basic video fade support.
Diffstat (limited to 'src/lib/player.cc')
-rw-r--r--src/lib/player.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc
index f83c9563b..5961292ca 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -300,6 +300,7 @@ Player::black_player_video_frame (DCPTime time) const
shared_ptr<const ImageProxy> (new RawImageProxy (_black_image, _film->log ())),
time,
Crop (),
+ optional<float> (),
_video_container_size,
_video_container_size,
Scaler::from_id ("bicubic"),
@@ -356,6 +357,7 @@ Player::get_video (DCPTime time, bool accurate)
i->image,
content_video_to_dcp (piece, i->frame),
content->crop (),
+ content->fade (i->frame),
image_size,
_video_container_size,
_film->scaler(),