Make terminate_threads() less likely to leave _threads containing invalid pointers.

[dcpomatic.git] / src / lib / image_content.h

diff --git a/src/lib/image_content.h b/src/lib/image_content.h
index 660d2ef9fc21883e09918ddedee29009ae7c5a4b..959923a51db83e0e1c4851d9fa95a39c161a7c2d 100644 (file)
--- 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;
+       DCPTime full_length (boost::shared_ptr<const Film> film) const;
+       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