X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer_video.h;h=f4bf2a47165be5dbc58b35a3f95e752db7e81ab6;hb=6e6ebf3122333b38333482bce64df3e6e61e64c4;hp=040145559a7e802bd66c67a41cde0da5fbc486bd;hpb=3e230d3785f19bc707fd7ea2b1f55321b93f536f;p=dcpomatic.git

diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index 040145559..f4bf2a471 100644
--- a/src/lib/player_video.h
+++ b/src/lib/player_video.h
@@ -30,6 +30,7 @@ extern "C" {
 #include <libavutil/pixfmt.h>
 }
 #include <boost/shared_ptr.hpp>
+#include <boost/weak_ptr.hpp>
 
 class Image;
 class ImageProxy;
@@ -50,11 +51,15 @@ public:
 		dcp::Size,
 		Eyes,
 		Part,
-		boost::optional<ColourConversion>
+		boost::optional<ColourConversion>,
+		boost::weak_ptr<Content>,
+		boost::optional<Frame>
 		);
 
 	PlayerVideo (boost::shared_ptr<cxml::Node>, boost::shared_ptr<Socket>);
 
+	boost::shared_ptr<PlayerVideo> shallow_copy () const;
+
 	void set_subtitle (PositionImage);
 
 	void prepare ();
@@ -66,6 +71,8 @@ public:
 	void add_metadata (xmlpp::Node* node) const;
 	void send_binary (boost::shared_ptr<Socket> socket) const;
 
+	bool reset_metadata (dcp::Size video_container_size, dcp::Size film_frame_size);
+
 	bool has_j2k () const;
 	dcp::Data j2k () const;
 
@@ -91,6 +98,8 @@ public:
 
 	bool same (boost::shared_ptr<const PlayerVideo> other) const;
 
+	size_t memory_used () const;
+
 private:
 	boost::shared_ptr<const ImageProxy> _in;
 	Crop _crop;
@@ -101,6 +110,10 @@ private:
 	Part _part;
 	boost::optional<ColourConversion> _colour_conversion;
 	boost::optional<PositionImage> _subtitle;
+	/** Content that we came from.  This is so that reset_metadata() can work */
+	boost::weak_ptr<Content> _content;
+	/** Video frame that we came from.  Again, this is for reset_metadata() */
+	boost::optional<Frame> _video_frame;
 };
 
 #endif