X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fplayer_video.h;h=77e19a80e7c911057aa1bd29897a763fc99b93e1;hb=4c60c74890ee16333ecf3adb87e69fc49d9a304f;hp=e9d260972824b10e58c3a4a71e2b2388b8bf97a3;hpb=cb990adba9c57e5107ef2aa9716cf0a26c1df83d;p=dcpomatic.git

diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index e9d260972..77e19a80e 100644
--- a/src/lib/player_video.h
+++ b/src/lib/player_video.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,21 +17,20 @@
 
 */
 
-#include <boost/shared_ptr.hpp>
-extern "C" {
-#include <libavutil/pixfmt.h>
-}
 #include "types.h"
 #include "position.h"
+#include "dcpomatic_time.h"
 #include "colour_conversion.h"
 #include "position_image.h"
+#include "data.h"
+extern "C" {
+#include <libavutil/pixfmt.h>
+}
+#include <boost/shared_ptr.hpp>
 
 class Image;
 class ImageProxy;
-class Scaler;
 class Socket;
-class Log;
-class EncodedData;
 
 /** 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,
@@ -44,26 +43,25 @@ public:
 		boost::shared_ptr<const ImageProxy>,
 		DCPTime,
 		Crop,
-		boost::optional<float>,
+		boost::optional<double>,
 		dcp::Size,
 		dcp::Size,
-		Scaler const *,
 		Eyes,
 		Part,
-		ColourConversion
+		boost::optional<ColourConversion>
 		);
-	
-	PlayerVideo (boost::shared_ptr<cxml::Node>, boost::shared_ptr<Socket>, boost::shared_ptr<Log>);
+
+	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) 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;
@@ -73,7 +71,7 @@ public:
 		return _eyes;
 	}
 
-	ColourConversion colour_conversion () const {
+	boost::optional<ColourConversion> colour_conversion () const {
 		return _colour_conversion;
 	}
 
@@ -91,12 +89,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;
-	ColourConversion _colour_conversion;
-	PositionImage _subtitle;
+	boost::optional<ColourConversion> _colour_conversion;
+	boost::optional<PositionImage> _subtitle;
 };