X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_content.h;h=69520fbd65a017fde85da1099105a3945d0286d2;hp=fedc43d6417f90c978281ee18b36c931d42ff558;hb=ac34066d5e448d1984d11a180be74e31b6e13b5c;hpb=df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc

diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h
index fedc43d64..69520fbd6 100644
--- a/src/lib/dcp_content.h
+++ b/src/lib/dcp_content.h
@@ -36,9 +36,10 @@ public:
 	static int const NEEDS_ASSETS;
 	static int const REFERENCE_VIDEO;
 	static int const REFERENCE_AUDIO;
-	static int const REFERENCE_CAPTION;
+	static int const REFERENCE_TEXT;
 	static int const NAME;
-	static int const CAPTIONS;
+	static int const TEXTS;
+	static int const CPL;
 };
 
 class ContentPart;
@@ -49,28 +50,29 @@ 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 ());
+	std::shared_ptr<DCPContent> shared_from_this () {
+		return std::dynamic_pointer_cast<DCPContent> (Content::shared_from_this ());
 	}
 
-	boost::shared_ptr<const DCPContent> shared_from_this () const {
-		return boost::dynamic_pointer_cast<const DCPContent> (Content::shared_from_this ());
+	std::shared_ptr<const DCPContent> shared_from_this () const {
+		return std::dynamic_pointer_cast<const DCPContent> (Content::shared_from_this ());
 	}
 
-	DCPTime full_length () const;
+	dcpomatic::DCPTime full_length (std::shared_ptr<const Film> film) const;
+	dcpomatic::DCPTime approximate_length () const;
 
-	void examine (boost::shared_ptr<Job>);
+	void examine (std::shared_ptr<const Film> film, std::shared_ptr<Job>);
 	std::string summary () const;
 	std::string technical_summary () 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 take_settings_from (std::shared_ptr<const Content> c);
 
 	void set_default_colour_conversion ();
-	std::list<DCPTime> reel_split_points () const;
+	std::list<dcpomatic::DCPTime> reel_split_points (std::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 (std::shared_ptr<const Film> film, std::string &) const;
 
 	void set_reference_audio (bool r);
 
@@ -106,19 +108,19 @@ public:
 		return _reference_audio;
 	}
 
-	bool can_reference_audio (std::string &) const;
+	bool can_reference_audio (std::shared_ptr<const Film> film, std::string &) const;
 
-	void set_reference_caption (TextType type, bool r);
+	void set_reference_text (TextType type, bool r);
 
-	/** @param type Original type of captions in the DCP.
-	 *  @return true if these captions are to be referenced.
+	/** @param type Original type of texts in the DCP.
+	 *  @return true if these texts are to be referenced.
 	 */
-	bool reference_caption (TextType type) const {
+	bool reference_text (TextType type) const {
 		boost::mutex::scoped_lock lm (_mutex);
-		return _reference_caption[type];
+		return _reference_text[static_cast<int>(type)];
 	}
 
-	bool can_reference_caption (TextType type, std::string &) const;
+	bool can_reference_text (std::shared_ptr<const Film> film, TextType type, std::string &) const;
 
 	void set_cpl (std::string id);
 
@@ -137,15 +139,44 @@ 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::vector<std::string> content_versions () const {
+		return _content_versions;
+	}
+
 private:
-	friend class reels_test5;
+	friend struct reels_test5;
 
-	void add_properties (std::list<UserProperty>& p) const;
+	void add_properties (std::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 (std::shared_ptr<const Film> film) const;
 	bool can_reference (
-		boost::function <bool (boost::shared_ptr<const Content>)>,
+		std::shared_ptr<const Film> film,
+		std::function <bool (std::shared_ptr<const Content>)>,
 		std::string overlapping,
 		std::string& why_not
 		) const;
@@ -166,13 +197,14 @@ private:
 	 *  rather than by rewrapping.
 	 */
 	bool _reference_audio;
-	/** true if the captions in this DCP should be included in the output by reference
-	 *  rather than by rewrapping.  The types here are the original caption types,
+	/** true if the texts in this DCP should be included in the output by reference
+	 *  rather than by rewrapping.  The types here are the original text types,
 	 *  not what they are being used for.
 	 */
-	bool _reference_caption[CAPTION_COUNT];
+	bool _reference_text[static_cast<int>(TextType::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::vector<std::string> _content_versions;
 };
 
 #endif