X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fdcp_content.h;h=892b6aa735f7cb3fc589dc416400ede1defeab90;hb=c2e58126cfeab07cd5a4ba02df62b932b8243a8d;hp=255cfa19a1e864ae0364d0d8a6bd4db208487f00;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h
index 255cfa19a..892b6aa73 100644
--- a/src/lib/dcp_content.h
+++ b/src/lib/dcp_content.h
@@ -32,10 +32,13 @@
 class DCPContentProperty
 {
 public:
-	static int const CAN_BE_PLAYED;
+	static int const NEEDS_KDM;
+	static int const NEEDS_ASSETS;
 	static int const REFERENCE_VIDEO;
 	static int const REFERENCE_AUDIO;
 	static int const REFERENCE_SUBTITLE;
+	static int const NAME;
+	static int const HAS_SUBTITLES;
 };
 
 class ContentPart;
@@ -62,13 +65,14 @@ public:
 	void examine (boost::shared_ptr<Job>);
 	std::string summary () const;
 	std::string technical_summary () const;
-	void as_xml (xmlpp::Node *) const;
+	void as_xml (xmlpp::Node *, bool with_paths) const;
 	std::string identifier () const;
+	void take_settings_from (boost::shared_ptr<const Content> c);
 
 	void set_default_colour_conversion ();
 	std::list<DCPTime> reel_split_points () const;
 
-	boost::filesystem::path directory () const;
+	std::vector<boost::filesystem::path> directories () const;
 
 	bool encrypted () const {
 		boost::mutex::scoped_lock lm (_mutex);
@@ -76,12 +80,15 @@ public:
 	}
 
 	void add_kdm (dcp::EncryptedKDM);
+	void add_ov (boost::filesystem::path ov);
 
 	boost::optional<dcp::EncryptedKDM> kdm () const {
 		return _kdm;
 	}
 
 	bool can_be_played () const;
+	bool needs_kdm () const;
+	bool needs_assets () const;
 
 	void set_reference_video (bool r);
 
@@ -110,7 +117,21 @@ public:
 
 	bool can_reference_subtitle (std::list<std::string> &) const;
 
+	void set_cpl (std::string id);
+
+	boost::optional<std::string> cpl () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _cpl;
+	}
+
+	std::string name () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _name;
+	}
+
 private:
+	friend class reels_test5;
+
 	void add_properties (std::list<UserProperty>& p) const;
 
 	void read_directory (boost::filesystem::path);
@@ -124,6 +145,8 @@ private:
 	std::string _name;
 	/** true if our DCP is encrypted */
 	bool _encrypted;
+	/** true if this DCP needs more assets before it can be played */
+	bool _needs_assets;
 	boost::optional<dcp::EncryptedKDM> _kdm;
 	/** true if _kdm successfully decrypts the first frame of our DCP */
 	bool _kdm_valid;
@@ -141,6 +164,13 @@ private:
 	bool _reference_subtitle;
 
 	boost::optional<dcp::Standard> _standard;
+	bool _three_d;
+	/** ID of the CPL to use; older metadata might not specify this: in that case
+	 *  just use the only CPL.
+	 */
+	boost::optional<std::string> _cpl;
+	/** List of the lengths of the reels in this DCP */
+	std::list<int64_t> _reel_lengths;
 };
 
 #endif