X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_content.h;h=65bed29bc91bd55b7ab16ce4ad3937ee151527bc;hb=895b386b6751afd3d068155f4ea71e762297672a;hp=2a3ef46e80092db8b2fd4288211eccac18975163;hpb=92f024ea58c7279b8096e5e9f60f9cb2613e8a91;p=dcpomatic.git

diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h
index 2a3ef46e8..65bed29bc 100644
--- a/src/lib/dcp_content.h
+++ b/src/lib/dcp_content.h
@@ -50,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 ());
@@ -61,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;
@@ -71,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;
 
@@ -98,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);
 
@@ -107,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);
 
@@ -119,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);
 
@@ -148,11 +149,13 @@ public:
 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