X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_video.h;h=8fd668b00dc7402a016a171b5967b54dcded8fa8;hb=80f27f81cc7991f52e4a41c7f687681fd9c15a65;hp=e8e90260ce9955fd390be34a4135489187710a07;hpb=1f82930e73679d6aec5223caa255f564339a1a2a;p=dcpomatic.git

diff --git a/src/lib/dcp_video.h b/src/lib/dcp_video.h
index e8e90260c..8fd668b00 100644
--- a/src/lib/dcp_video.h
+++ b/src/lib/dcp_video.h
@@ -18,21 +18,21 @@
 
 */
 
-#include <dcp/picture_mxf_writer.h>
 #include "util.h"
+#include <dcp/picture_asset_writer.h>
+#include <libcxml/cxml.h>
 
 /** @file  src/dcp_video_frame.h
  *  @brief A single frame of video destined for a DCP.
  */
 
-class Film;
 class ServerDescription;
 class Scaler;
 class Image;
 class Log;
 class Subtitle;
 class PlayerVideo;
-class EncodedData;
+class Data;
 
 /** @class DCPVideo
  *  @brief A single frame of video destined for a DCP.
@@ -46,28 +46,29 @@ class EncodedData;
 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>);
 
-	boost::shared_ptr<EncodedData> encode_locally ();
-	boost::shared_ptr<EncodedData> encode_remotely (ServerDescription);
+	Data encode_locally (dcp::NoteHandler note);
+	Data encode_remotely (ServerDescription);
 
 	int index () const {
 		return _index;
 	}
 
 	Eyes eyes () const;
-	
+
+	bool same (boost::shared_ptr<const DCPVideo> other) const;
+
 private:
 
 	void add_metadata (xmlpp::Element *) const;
-	
+
 	boost::shared_ptr<const PlayerVideo> _frame;
 	int _index;			 ///< frame index within the DCP's intrinsic duration
 	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
 };