X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_content.h;h=6d707670f27eb6bc267d98cefe7bbcd487cdc31f;hb=f644c272a6a6384f6bfc6ca16ada6208057402a8;hp=cccf127c31732d00f1003bdf82fc2d6d78bc3097;hpb=a5c629cb9b638b67a0e4c2d26fe9ab2e124bf0eb;p=dcpomatic.git

diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h
index cccf127c3..6d707670f 100644
--- a/src/lib/dcp_content.h
+++ b/src/lib/dcp_content.h
@@ -39,6 +39,7 @@ public:
 	static int const REFERENCE_TEXT;
 	static int const NAME;
 	static int const TEXTS;
+	static int const CPL;
 };
 
 class ContentPart;
@@ -49,8 +50,8 @@ class ContentPart;
 class DCPContent : public Content
 {
 public:
-	DCPContent (boost::shared_ptr<const Film>, boost::filesystem::path p);
-	DCPContent (boost::shared_ptr<const Film>, cxml::ConstNodePtr, int version);
+	DCPContent (boost::filesystem::path p);
+	DCPContent (cxml::ConstNodePtr, int version);
 
 	boost::shared_ptr<DCPContent> shared_from_this () {
 		return boost::dynamic_pointer_cast<DCPContent> (Content::shared_from_this ());
@@ -60,9 +61,10 @@ public:
 		return boost::dynamic_pointer_cast<const DCPContent> (Content::shared_from_this ());
 	}
 
-	DCPTime full_length () const;
+	dcpomatic::DCPTime full_length (boost::shared_ptr<const Film> film) const;
+	dcpomatic::DCPTime approximate_length () const;
 
-	void examine (boost::shared_ptr<Job>);
+	void examine (boost::shared_ptr<const Film> film, boost::shared_ptr<Job>);
 	std::string summary () const;
 	std::string technical_summary () const;
 	void as_xml (xmlpp::Node *, bool with_paths) const;
@@ -70,7 +72,7 @@ public:
 	void take_settings_from (boost::shared_ptr<const Content> c);
 
 	void set_default_colour_conversion ();
-	std::list<DCPTime> reel_split_points () const;
+	std::list<dcpomatic::DCPTime> reel_split_points (boost::shared_ptr<const Film> film) const;
 
 	std::vector<boost::filesystem::path> directories () const;
 
@@ -97,7 +99,7 @@ public:
 		return _reference_video;
 	}
 
-	bool can_reference_video (std::string &) const;
+	bool can_reference_video (boost::shared_ptr<const Film> film, std::string &) const;
 
 	void set_reference_audio (bool r);
 
@@ -106,7 +108,7 @@ public:
 		return _reference_audio;
 	}
 
-	bool can_reference_audio (std::string &) const;
+	bool can_reference_audio (boost::shared_ptr<const Film> film, std::string &) const;
 
 	void set_reference_text (TextType type, bool r);
 
@@ -118,7 +120,7 @@ public:
 		return _reference_text[type];
 	}
 
-	bool can_reference_text (TextType type, std::string &) const;
+	bool can_reference_text (boost::shared_ptr<const Film> film, TextType type, std::string &) const;
 
 	void set_cpl (std::string id);
 
@@ -137,14 +139,43 @@ public:
 		return _three_d;
 	}
 
+	boost::optional<dcp::ContentKind> content_kind () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _content_kind;
+	}
+
+	dcp::Standard standard () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		DCPOMATIC_ASSERT (_standard);
+		return _standard.get ();
+	}
+
+	std::map<dcp::Marker, dcpomatic::ContentTime> markers () const {
+		return _markers;
+	}
+
+	bool kdm_timing_window_valid () const;
+
+	Resolution resolution () const;
+
+	std::vector<dcp::Rating> ratings () const {
+		return _ratings;
+	}
+
+	std::string content_version () const {
+		return _content_version;
+	}
+
 private:
 	friend class reels_test5;
 
-	void add_properties (std::list<UserProperty>& p) const;
+	void add_properties (boost::shared_ptr<const Film> film, std::list<UserProperty>& p) const;
 
 	void read_directory (boost::filesystem::path);
-	std::list<DCPTimePeriod> reels () const;
+	void read_sub_directory (boost::filesystem::path);
+	std::list<dcpomatic::DCPTimePeriod> reels (boost::shared_ptr<const Film> film) const;
 	bool can_reference (
+		boost::shared_ptr<const Film> film,
 		boost::function <bool (boost::shared_ptr<const Content>)>,
 		std::string overlapping,
 		std::string& why_not
@@ -173,6 +204,7 @@ private:
 	bool _reference_text[TEXT_COUNT];
 
 	boost::optional<dcp::Standard> _standard;
+	boost::optional<dcp::ContentKind> _content_kind;
 	bool _three_d;
 	/** ID of the CPL to use; older metadata might not specify this: in that case
 	 *  just use the only CPL.
@@ -180,6 +212,9 @@ private:
 	boost::optional<std::string> _cpl;
 	/** List of the lengths of the reels in this DCP */
 	std::list<int64_t> _reel_lengths;
+	std::map<dcp::Marker, dcpomatic::ContentTime> _markers;
+	std::vector<dcp::Rating> _ratings;
+	std::string _content_version;
 };
 
 #endif