X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_content.h;h=81396c63ba19a95683c856d2441d17f62db80306;hb=b1ef870b61528feb0d72ed9d7fe54447b3b5c7db;hp=bc0f331515f861f71134706c661b246f7efd8b2e;hpb=254b3044d72de6b033d7c584f5abd2b9aa70aad5;p=dcpomatic.git diff --git a/src/lib/image_content.h b/src/lib/image_content.h index bc0f33151..81396c63b 100644 --- a/src/lib/image_content.h +++ b/src/lib/image_content.h @@ -29,15 +29,20 @@ public: ImageContent (boost::filesystem::path); ImageContent (cxml::ConstNodePtr, int); - boost::shared_ptr shared_from_this () { - return boost::dynamic_pointer_cast (Content::shared_from_this ()); + std::shared_ptr shared_from_this () { + return std::dynamic_pointer_cast (Content::shared_from_this ()); }; - void examine (boost::shared_ptr film, boost::shared_ptr); + std::shared_ptr shared_from_this () const { + return std::dynamic_pointer_cast (Content::shared_from_this ()); + }; + + void examine (std::shared_ptr film, std::shared_ptr); std::string summary () const; std::string technical_summary () const; void as_xml (xmlpp::Node *, bool with_paths) const; - DCPTime full_length (boost::shared_ptr film) const; + dcpomatic::DCPTime full_length (std::shared_ptr film) const; + dcpomatic::DCPTime approximate_length () const; std::string identifier () const; @@ -46,7 +51,7 @@ public: bool still () const; private: - void add_properties (std::list& p) const; + void add_properties (std::shared_ptr film, std::list& p) const; boost::optional _path_to_scan; };