diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-11-21 01:59:04 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-11-21 01:59:04 +0000 |
| commit | 254b3044d72de6b033d7c584f5abd2b9aa70aad5 (patch) | |
| tree | 8a5c83c1b2dea690672663dedb2f3aa50f4473dc /src/lib/player_video.cc | |
| parent | c31b9542c58ae1cbfae7ec3ba4911359fd010ba2 (diff) | |
Take Film pointer out of Content.
Diffstat (limited to 'src/lib/player_video.cc')
| -rw-r--r-- | src/lib/player_video.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc index 94432d66e..6c0cf20c1 100644 --- a/src/lib/player_video.cc +++ b/src/lib/player_video.cc @@ -315,7 +315,7 @@ PlayerVideo::shallow_copy () const * @return true if this was possible, false if not. */ bool -PlayerVideo::reset_metadata (dcp::Size video_container_size, dcp::Size film_frame_size) +PlayerVideo::reset_metadata (shared_ptr<const Film> film, dcp::Size video_container_size, dcp::Size film_frame_size) { shared_ptr<Content> content = _content.lock(); if (!content || !_video_frame) { @@ -323,7 +323,7 @@ PlayerVideo::reset_metadata (dcp::Size video_container_size, dcp::Size film_fram } _crop = content->video->crop(); - _fade = content->video->fade(_video_frame.get()); + _fade = content->video->fade(film, _video_frame.get()); _inter_size = content->video->scale().size(content->video, video_container_size, film_frame_size); _out_size = video_container_size; _colour_conversion = content->video->colour_conversion(); |