1 files changed, 12 insertions, 7 deletions

diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h
index 3753740a2..be2c72002 100644
--- a/src/lib/dcp_content.h
+++ b/src/lib/dcp_content.h
@@ -32,6 +32,7 @@
 #include "enum_indexed_vector.h"
 #include "font.h"
 #include "resolution.h"
+#include "video_encoding.h"
 #include <libcxml/cxml.h>
 #include <dcp/content_kind.h>
 #include <dcp/encrypted_kdm.h>
@@ -75,7 +76,7 @@ public:
 	void examine (std::shared_ptr<const Film> film, std::shared_ptr<Job>) override;
 	std::string summary () const override;
 	std::string technical_summary () const override;
-	void as_xml (xmlpp::Node *, bool with_paths) const override;
+	void as_xml(xmlpp::Element*, bool with_paths) const override;
 	std::string identifier () const override;
 	void take_settings_from (std::shared_ptr<const Content> c) override;
 
@@ -100,6 +101,8 @@ public:
 	bool needs_kdm () const;
 	bool needs_assets () const;
 
+	bool can_reference_anything(std::shared_ptr<const Film> film, std::string& why_not) const;
+
 	void set_reference_video (bool r);
 
 	bool reference_video () const {
@@ -158,6 +161,11 @@ public:
 		return _standard.get ();
 	}
 
+	VideoEncoding video_encoding() const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _video_encoding;
+	}
+
 	std::map<dcp::Marker, dcpomatic::ContentTime> markers () const {
 		return _markers;
 	}
@@ -186,12 +194,7 @@ private:
 	void read_directory (boost::filesystem::path);
 	void read_sub_directory (boost::filesystem::path);
 	std::list<dcpomatic::DCPTimePeriod> reels (std::shared_ptr<const Film> film) const;
-	bool can_reference (
-		std::shared_ptr<const Film> film,
-		std::function <bool (std::shared_ptr<const Content>)>,
-		std::string overlapping,
-		std::string& why_not
-		) const;
+	bool overlaps(std::shared_ptr<const Film> film, std::function<bool (std::shared_ptr<const Content>)> part) const;
 
 	std::string _name;
 	/** true if our DCP is encrypted */
@@ -216,6 +219,7 @@ private:
 	EnumIndexedVector<bool, TextType> _reference_text;
 
 	boost::optional<dcp::Standard> _standard;
+	VideoEncoding _video_encoding;
 	boost::optional<dcp::ContentKind> _content_kind;
 	bool _three_d;
 	/** ID of the CPL to use; older metadata might not specify this: in that case
@@ -227,6 +231,7 @@ private:
 	std::map<dcp::Marker, dcpomatic::ContentTime> _markers;
 	std::vector<dcp::Rating> _ratings;
 	std::vector<std::string> _content_versions;
+	EnumIndexedVector<bool, TextType> _has_non_zero_entry_point;
 
 	boost::optional<int> _active_audio_channels;
 };