Remove some unused things in PlayerVideo.

3 files changed, 8 insertions, 16 deletions

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 79db7cc2c..67fbd8738 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -344,8 +344,7 @@ Player::black_player_video_frame (Eyes eyes) const
 			PART_WHOLE,
 			PresetColourConversion::all().front().conversion,
 			VIDEO_RANGE_FULL,
-			boost::weak_ptr<Content>(),
-			boost::optional<Frame>()
+			boost::weak_ptr<Content>()
 		)
 	);
 }
@@ -847,8 +846,7 @@ Player::video (weak_ptr<Piece> wp, ContentVideo video)
 			video.part,
 			piece->content->video->colour_conversion(),
 			piece->content->video->range(),
-			piece->content,
-			video.frame
+			piece->content
 			)
 		);
 
diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc
index ec1cfca9c..74692b054 100644
--- a/src/lib/player_video.cc
+++ b/src/lib/player_video.cc
@@ -53,8 +53,7 @@ PlayerVideo::PlayerVideo (
 	Part part,
 	optional<ColourConversion> colour_conversion,
 	VideoRange video_range,
-	weak_ptr<Content> content,
-	optional<Frame> video_frame
+	weak_ptr<Content> content
 	)
 	: _in (in)
 	, _crop (crop)
@@ -66,7 +65,6 @@ PlayerVideo::PlayerVideo (
 	, _colour_conversion (colour_conversion)
 	, _video_range (video_range)
 	, _content (content)
-	, _video_frame (video_frame)
 {
 
 }
@@ -314,8 +312,7 @@ PlayerVideo::shallow_copy () const
 			_part,
 			_colour_conversion,
 			_video_range,
-			_content,
-			_video_frame
+			_content
 			)
 		);
 }
@@ -324,10 +321,10 @@ PlayerVideo::shallow_copy () const
  *  @return true if this was possible, false if not.
  */
 bool
-PlayerVideo::reset_metadata (shared_ptr<const Film> film, dcp::Size video_container_size, dcp::Size film_frame_size)
+PlayerVideo::reset_metadata (dcp::Size video_container_size)
 {
 	shared_ptr<Content> content = _content.lock();
-	if (!content || !_video_frame) {
+	if (!content) {
 		return false;
 	}
 
diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index 4b1a84e01..cefb5cdb8 100644
--- a/src/lib/player_video.h
+++ b/src/lib/player_video.h
@@ -55,8 +55,7 @@ public:
 		Part,
 		boost::optional<ColourConversion>,
 		VideoRange video_range,
-		boost::weak_ptr<Content>,
-		boost::optional<Frame>
+		boost::weak_ptr<Content>
 		);
 
 	PlayerVideo (boost::shared_ptr<cxml::Node>, boost::shared_ptr<Socket>);
@@ -74,7 +73,7 @@ public:
 	void add_metadata (xmlpp::Node* node) const;
 	void send_binary (boost::shared_ptr<Socket> socket) const;
 
-	bool reset_metadata (boost::shared_ptr<const Film> film, dcp::Size video_container_size, dcp::Size film_frame_size);
+	bool reset_metadata (dcp::Size video_container_size);
 
 	bool has_j2k () const;
 	dcp::Data j2k () const;
@@ -124,8 +123,6 @@ private:
 	 *  for variant:swaroop's non-skippable ads.
 	 */
 	boost::weak_ptr<Content> _content;
-	/** Video frame that we came from.  Again, this is for reset_metadata() */
-	boost::optional<Frame> _video_frame;
 
 	mutable boost::mutex _mutex;
 	mutable boost::shared_ptr<Image> _image;