X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_content.h;h=970a68d661271be3b567d714ec880cc55111527a;hb=cc8ea498a3ff9421765a99c347e03533cb0595d4;hp=660d2ef9fc21883e09918ddedee29009ae7c5a4b;hpb=1a693725f9a8cc6ba58f65b2f1ef03255d295f23;p=dcpomatic.git

diff --git a/src/lib/image_content.h b/src/lib/image_content.h
index 660d2ef9f..970a68d66 100644
--- a/src/lib/image_content.h
+++ b/src/lib/image_content.h
@@ -26,18 +26,23 @@
 class ImageContent : public Content
 {
 public:
-	ImageContent (boost::shared_ptr<const Film>, boost::filesystem::path);
-	ImageContent (boost::shared_ptr<const Film>, cxml::ConstNodePtr, int);
+	ImageContent (boost::filesystem::path);
+	ImageContent (cxml::ConstNodePtr, int);
 
 	boost::shared_ptr<ImageContent> shared_from_this () {
 		return boost::dynamic_pointer_cast<ImageContent> (Content::shared_from_this ());
 	};
 
-	void examine (boost::shared_ptr<Job>);
+	boost::shared_ptr<const ImageContent> shared_from_this () const {
+		return boost::dynamic_pointer_cast<const ImageContent> (Content::shared_from_this ());
+	};
+
+	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;
-	DCPTime full_length () const;
+	dcpomatic::DCPTime full_length (boost::shared_ptr<const Film> film) const;
+	dcpomatic::DCPTime approximate_length () const;
 
 	std::string identifier () const;
 
@@ -46,7 +51,9 @@ public:
 	bool still () const;
 
 private:
-	void add_properties (std::list<UserProperty>& p) const;
+	void add_properties (boost::shared_ptr<const Film> film, std::list<UserProperty>& p) const;
+
+	boost::optional<boost::filesystem::path> _path_to_scan;
 };
 
 #endif