X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fplayer_video.cc;h=b020ca1cd8172ba1cd5193c5658d42c621166171;hp=d45bf9f432b90c996feb870baf1580fc3a5796a4;hb=fb2e821b36c4b50709f3a085131325b668d4ed57;hpb=95469c2bb15f490f7d3fbeaed9903bd0cbc13677

diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc
index d45bf9f43..b020ca1cd 100644
--- a/src/lib/player_video.cc
+++ b/src/lib/player_video.cc
@@ -45,6 +45,7 @@ using std::weak_ptr;
 using boost::optional;
 using dcp::Data;
 using dcp::raw_convert;
+using namespace dcpomatic;
 
 
 PlayerVideo::PlayerVideo (
@@ -58,7 +59,7 @@ PlayerVideo::PlayerVideo (
 	optional<ColourConversion> colour_conversion,
 	VideoRange video_range,
 	weak_ptr<Content> content,
-	optional<Frame> video_frame,
+	optional<ContentTime> video_time,
 	bool error
 	)
 	: _in (in)
@@ -71,7 +72,7 @@ PlayerVideo::PlayerVideo (
 	, _colour_conversion (colour_conversion)
 	, _video_range (video_range)
 	, _content (content)
-	, _video_frame (video_frame)
+	, _video_time(video_time)
 	, _error (error)
 {
 
@@ -343,7 +344,7 @@ PlayerVideo::shallow_copy () const
 		_colour_conversion,
 		_video_range,
 		_content,
-		_video_frame,
+		_video_time,
 		_error
 		);
 }
@@ -356,12 +357,12 @@ bool
 PlayerVideo::reset_metadata (shared_ptr<const Film> film, dcp::Size player_video_container_size)
 {
 	auto content = _content.lock();
-	if (!content || !_video_frame) {
+	if (!content || !_video_time) {
 		return false;
 	}
 
 	_crop = content->video->actual_crop();
-	_fade = content->video->fade(film, _video_frame.get());
+	_fade = content->video->fade(film, _video_time.get());
 	_inter_size = scale_for_display(
 		content->video->scaled_size(film->frame_size()),
 		player_video_container_size,