X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_content.h;h=fedc43d6417f90c978281ee18b36c931d42ff558;hb=df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc;hp=21b654c96040d756ad37888f427ca49ccc1f91bd;hpb=0ac8235fa4addb021c0e05a9c6c19a7d22097458;p=dcpomatic.git

diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h
index 21b654c96..fedc43d64 100644
--- a/src/lib/dcp_content.h
+++ b/src/lib/dcp_content.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -36,7 +36,9 @@ public:
 	static int const NEEDS_ASSETS;
 	static int const REFERENCE_VIDEO;
 	static int const REFERENCE_AUDIO;
-	static int const REFERENCE_SUBTITLE;
+	static int const REFERENCE_CAPTION;
+	static int const NAME;
+	static int const CAPTIONS;
 };
 
 class ContentPart;
@@ -65,7 +67,7 @@ public:
 	std::string technical_summary () const;
 	void as_xml (xmlpp::Node *, bool with_paths) const;
 	std::string identifier () const;
-	void use_template (boost::shared_ptr<const Content> c);
+	void take_settings_from (boost::shared_ptr<const Content> c);
 
 	void set_default_colour_conversion ();
 	std::list<DCPTime> reel_split_points () const;
@@ -95,7 +97,7 @@ public:
 		return _reference_video;
 	}
 
-	bool can_reference_video (std::list<std::string> &) const;
+	bool can_reference_video (std::string &) const;
 
 	void set_reference_audio (bool r);
 
@@ -104,16 +106,19 @@ public:
 		return _reference_audio;
 	}
 
-	bool can_reference_audio (std::list<std::string> &) const;
+	bool can_reference_audio (std::string &) const;
 
-	void set_reference_subtitle (bool r);
+	void set_reference_caption (TextType type, bool r);
 
-	bool reference_subtitle () const {
+	/** @param type Original type of captions in the DCP.
+	 *  @return true if these captions are to be referenced.
+	 */
+	bool reference_caption (TextType type) const {
 		boost::mutex::scoped_lock lm (_mutex);
-		return _reference_subtitle;
+		return _reference_caption[type];
 	}
 
-	bool can_reference_subtitle (std::list<std::string> &) const;
+	bool can_reference_caption (TextType type, std::string &) const;
 
 	void set_cpl (std::string id);
 
@@ -122,6 +127,16 @@ public:
 		return _cpl;
 	}
 
+	std::string name () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _name;
+	}
+
+	bool three_d () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _three_d;
+	}
+
 private:
 	friend class reels_test5;
 
@@ -130,9 +145,9 @@ private:
 	void read_directory (boost::filesystem::path);
 	std::list<DCPTimePeriod> reels () const;
 	bool can_reference (
-		boost::function <boost::shared_ptr<ContentPart> (boost::shared_ptr<const Content>)>,
+		boost::function <bool (boost::shared_ptr<const Content>)>,
 		std::string overlapping,
-		std::list<std::string>& why_not
+		std::string& why_not
 		) const;
 
 	std::string _name;
@@ -151,10 +166,11 @@ private:
 	 *  rather than by rewrapping.
 	 */
 	bool _reference_audio;
-	/** true if the subtitle in this DCP should be included in the output by reference
-	 *  rather than by rewrapping.
+	/** 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,
+	 *  not what they are being used for.
 	 */
-	bool _reference_subtitle;
+	bool _reference_caption[CAPTION_COUNT];
 
 	boost::optional<dcp::Standard> _standard;
 	bool _three_d;
@@ -162,6 +178,8 @@ private:
 	 *  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