X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_video.h;h=a61a757bd0900221c69e0721880a921d7cbb062d;hb=6fde557864505b470c438e4161ee494f29b90d63;hp=97be0779802b8cc7653feed28b24f68fcb2957bb;hpb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;p=dcpomatic.git

diff --git a/src/lib/dcp_video.h b/src/lib/dcp_video.h
index 97be07798..a61a757bd 100644
--- a/src/lib/dcp_video.h
+++ b/src/lib/dcp_video.h
@@ -18,21 +18,17 @@
 
 */
 
-#include "util.h"
-#include <dcp/picture_asset_writer.h>
+#include "types.h"
+#include "encode_server_description.h"
 #include <libcxml/cxml.h>
+#include <dcp/data.h>
 
 /** @file  src/dcp_video_frame.h
  *  @brief A single frame of video destined for a DCP.
  */
 
-class ServerDescription;
-class Scaler;
-class Image;
 class Log;
-class Subtitle;
 class PlayerVideo;
-class Data;
 
 /** @class DCPVideo
  *  @brief A single frame of video destined for a DCP.
@@ -46,11 +42,11 @@ class Data;
 class DCPVideo : public boost::noncopyable
 {
 public:
-	DCPVideo (boost::shared_ptr<const PlayerVideo>, int, int, int, Resolution, bool b, boost::shared_ptr<Log>);
+	DCPVideo (boost::shared_ptr<const PlayerVideo>, int, int, int, Resolution, boost::shared_ptr<Log>);
 	DCPVideo (boost::shared_ptr<const PlayerVideo>, cxml::ConstNodePtr, boost::shared_ptr<Log>);
 
-	Data encode_locally (dcp::NoteHandler note);
-	Data encode_remotely (ServerDescription);
+	dcp::Data encode_locally (dcp::NoteHandler note);
+	dcp::Data encode_remotely (EncodeServerDescription, int timeout = 30);
 
 	int index () const {
 		return _index;
@@ -60,6 +56,8 @@ public:
 
 	bool same (boost::shared_ptr<const DCPVideo> other) const;
 
+	static boost::shared_ptr<dcp::OpenJPEGImage> convert_to_xyz (boost::shared_ptr<const PlayerVideo> frame, dcp::NoteHandler note);
+
 private:
 
 	void add_metadata (xmlpp::Element *) const;
@@ -69,7 +67,6 @@ private:
 	int _frames_per_second;		 ///< Frames per second that we will use for the DCP
 	int _j2k_bandwidth;		 ///< J2K bandwidth to use
 	Resolution _resolution;          ///< Resolution (2K or 4K)
-	bool _burn_subtitles;            ///< true to burn subtitles into the image
 
 	boost::shared_ptr<Log> _log; ///< log
 };