X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_video.h;h=c1c48623def2595f4979f0a36bb2da2d3363c777;hb=ad27e9acc3d99a29fdc358da62feb603983f8882;hp=e8e90260ce9955fd390be34a4135489187710a07;hpb=40b654453c2ce0b266f43c36f1b9a5d1705f983c;p=dcpomatic.git

diff --git a/src/lib/dcp_video.h b/src/lib/dcp_video.h
index e8e90260c..c1c48623d 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.
@@ -49,14 +49,16 @@ public:
 	DCPVideo (boost::shared_ptr<const PlayerVideo>, int, int, int, Resolution, bool b, 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: