X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_content.h;h=65bed29bc91bd55b7ab16ce4ad3937ee151527bc;hp=656c96897177448aa37aad8bbf58cef988e83030;hb=5eb8b5c3a1566aef638e9d9df03b88d320735092;hpb=673ba43fb66eb0dee43807501753749f144254a7

diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h
index 656c96897..65bed29bc 100644
--- a/src/lib/dcp_content.h
+++ b/src/lib/dcp_content.h
@@ -61,8 +61,8 @@ public:
 		return boost::dynamic_pointer_cast<const DCPContent> (Content::shared_from_this ());
 	}
 
-	DCPTime full_length (boost::shared_ptr<const Film> film) const;
-	DCPTime approximate_length () const;
+	dcpomatic::DCPTime full_length (boost::shared_ptr<const Film> film) const;
+	dcpomatic::DCPTime approximate_length () const;
 
 	void examine (boost::shared_ptr<const Film> film, boost::shared_ptr<Job>);
 	std::string summary () const;
@@ -72,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 (boost::shared_ptr<const Film> film) const;
+	std::list<dcpomatic::DCPTime> reel_split_points (boost::shared_ptr<const Film> film) const;
 
 	std::vector<boost::filesystem::path> directories () const;
 
@@ -152,7 +152,8 @@ private:
 	void add_properties (boost::shared_ptr<const Film> film, std::list<UserProperty>& p) const;
 
 	void read_directory (boost::filesystem::path);
-	std::list<DCPTimePeriod> reels (boost::shared_ptr<const Film> film) 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>)>,