X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fimage_content.h;h=959923a51db83e0e1c4851d9fa95a39c161a7c2d;hp=edcbec6ddb04122cc3211797d24edf40757510e2;hb=HEAD;hpb=b8ab7864ea798d633c4dbfa6be69c58a227d9ca2

diff --git a/src/lib/image_content.h b/src/lib/image_content.h
index edcbec6dd..d817eeee8 100644
--- a/src/lib/image_content.h
+++ b/src/lib/image_content.h
@@ -26,27 +26,34 @@
 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 ());
+	std::shared_ptr<ImageContent> shared_from_this () {
+		return std::dynamic_pointer_cast<ImageContent> (Content::shared_from_this ());
 	};
 
-	void examine (boost::shared_ptr<Job>);
-	std::string summary () const;
-	std::string technical_summary () const;
-	void as_xml (xmlpp::Node *) const;
-	DCPTime full_length () const;
+	std::shared_ptr<const ImageContent> shared_from_this () const {
+		return std::dynamic_pointer_cast<const ImageContent> (Content::shared_from_this ());
+	};
+
+	void examine (std::shared_ptr<const Film> film, std::shared_ptr<Job>) override;
+	std::string summary () const override;
+	std::string technical_summary () const override;
+	void as_xml (xmlpp::Node *, bool with_paths) const override;
+	dcpomatic::DCPTime full_length (std::shared_ptr<const Film> film) const override;
+	dcpomatic::DCPTime approximate_length () const override;
 
-	std::string identifier () const;
+	std::string identifier () const override;
 
 	void set_default_colour_conversion ();
 
 	bool still () const;
 
 private:
-	void add_properties (std::list<UserProperty>& p) const;
+	void add_properties (std::shared_ptr<const Film> film, std::list<UserProperty>& p) const override;
+
+	boost::optional<boost::filesystem::path> _path_to_scan;
 };
 
 #endif