X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer_video.h;h=0a6cab9069e189c9ea6bdf1161a1a9912edf59a1;hb=4a4725e41bf4070969223f9c40885063c50e61d0;hp=6762ea8d1b219665066964cbc941ba5ae6927397;hpb=228fbab81a5f093e9265d565c1110582c363def3;p=dcpomatic.git

diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index 6762ea8d1..0a6cab906 100644
--- a/src/lib/player_video.h
+++ b/src/lib/player_video.h
@@ -28,9 +28,8 @@ extern "C" {
 
 class Image;
 class ImageProxy;
-class Scaler;
 class Socket;
-class EncodedData;
+class Data;
 
 /** Everything needed to describe a video frame coming out of the player, but with the
  *  bits still their raw form.  We may want to combine the bits on a remote machine,
@@ -43,26 +42,25 @@ public:
 		boost::shared_ptr<const ImageProxy>,
 		DCPTime,
 		Crop,
-		boost::optional<float>,
+		boost::optional<double>,
 		dcp::Size,
 		dcp::Size,
-		Scaler const *,
 		Eyes,
 		Part,
 		boost::optional<ColourConversion>
 		);
-	
+
 	PlayerVideo (boost::shared_ptr<cxml::Node>, boost::shared_ptr<Socket>);
 
 	void set_subtitle (PositionImage);
-	
-	boost::shared_ptr<Image> image (AVPixelFormat pix_fmt, bool burn_subtitle, dcp::NoteHandler note) const;
 
-	void add_metadata (xmlpp::Node* node, bool send_subtitles) const;
-	void send_binary (boost::shared_ptr<Socket> socket, bool send_subtitles) const;
+	boost::shared_ptr<Image> image (AVPixelFormat pix_fmt, dcp::NoteHandler note) const;
+
+	void add_metadata (xmlpp::Node* node) const;
+	void send_binary (boost::shared_ptr<Socket> socket) const;
 
 	bool has_j2k () const;
-	boost::shared_ptr<EncodedData> j2k () const;
+	Data j2k () const;
 
 	DCPTime time () const {
 		return _time;
@@ -90,12 +88,11 @@ private:
 	boost::shared_ptr<const ImageProxy> _in;
 	DCPTime _time;
 	Crop _crop;
-	boost::optional<float> _fade;
+	boost::optional<double> _fade;
 	dcp::Size _inter_size;
 	dcp::Size _out_size;
-	Scaler const * _scaler;
 	Eyes _eyes;
 	Part _part;
 	boost::optional<ColourConversion> _colour_conversion;
-	PositionImage _subtitle;
+	boost::optional<PositionImage> _subtitle;
 };