X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_video.h;h=81ddc4470c9e748f81289262a3da382eae11ee68;hp=5d8b9b720a3aef0da98223f287e3668755d8f8b9;hb=HEAD;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26

diff --git a/src/lib/dcp_video.h b/src/lib/dcp_video.h
index 5d8b9b720..bf95ccfe6 100644
--- a/src/lib/dcp_video.h
+++ b/src/lib/dcp_video.h
@@ -18,18 +18,23 @@
 
 */
 
-#include "types.h"
+
 #include "encode_server_description.h"
+#include "resolution.h"
 #include <libcxml/cxml.h>
 #include <dcp/array_data.h>
+#include <dcp/openjpeg_image.h>
+
 
 /** @file  src/dcp_video_frame.h
  *  @brief A single frame of video destined for a DCP.
  */
 
+
 class Log;
 class PlayerVideo;
 
+
 /** @class DCPVideo
  *  @brief A single frame of video destined for a DCP.
  *
@@ -39,14 +44,17 @@ class PlayerVideo;
  *  Objects of this class are used for the queue that we keep
  *  of images that require encoding.
  */
-class DCPVideo : public boost::noncopyable
+class DCPVideo
 {
 public:
-	DCPVideo (std::shared_ptr<const PlayerVideo>, int, int, int, Resolution);
+	DCPVideo (std::shared_ptr<const PlayerVideo>, int index, int dcp_fps, int bandwidth, Resolution r);
 	DCPVideo (std::shared_ptr<const PlayerVideo>, cxml::ConstNodePtr);
 
-	dcp::ArrayData encode_locally ();
-	dcp::ArrayData encode_remotely (EncodeServerDescription, int timeout = 30);
+	DCPVideo (DCPVideo const&) = default;
+	DCPVideo& operator= (DCPVideo const&) = default;
+
+	dcp::ArrayData encode_locally () const;
+	dcp::ArrayData encode_remotely (EncodeServerDescription, int timeout = 30) const;
 
 	int index () const {
 		return _index;
@@ -56,7 +64,7 @@ public:
 
 	bool same (std::shared_ptr<const DCPVideo> other) const;
 
-	static std::shared_ptr<dcp::OpenJPEGImage> convert_to_xyz (std::shared_ptr<const PlayerVideo> frame, dcp::NoteHandler note);
+	static std::shared_ptr<dcp::OpenJPEGImage> convert_to_xyz(std::shared_ptr<const PlayerVideo> frame);
 
 private: