X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fimage_content.h;h=d817eeee84e4cc0b6a2685666db207eae79a0025;hp=bc0f331515f861f71134706c661b246f7efd8b2e;hb=182b9d2e2feb6545592868606aaf0f0146095481;hpb=254b3044d72de6b033d7c584f5abd2b9aa70aad5 diff --git a/src/lib/image_content.h b/src/lib/image_content.h index bc0f33151..d817eeee8 100644 --- a/src/lib/image_content.h +++ b/src/lib/image_content.h @@ -29,24 +29,29 @@ 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::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; + 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) 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 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& p) const; + void add_properties (std::shared_ptr film, std::list& p) const override; boost::optional _path_to_scan; };