Use dcp::file_to_string().

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

diff --git a/src/lib/image_content.h b/src/lib/image_content.h
index e2a2ec36623b40faa6a7b69baca72e698d0a01d5..81396c63ba19a95683c856d2441d17f62db80306 100644 (file)
--- a/src/lib/image_content.h
+++ b/src/lib/image_content.h
@@ -29,20 +29,20 @@ public:
        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 ());
        };
 
-       boost::shared_ptr<const ImageContent> shared_from_this () const {
-               return boost::dynamic_pointer_cast<const ImageContent> (Content::shared_from_this ());
+       std::shared_ptr<const ImageContent> shared_from_this () const {
+               return std::dynamic_pointer_cast<const ImageContent> (Content::shared_from_this ());
        };
 
-       void examine (boost::shared_ptr<const Film> film, boost::shared_ptr<Job>);
+       void examine (std::shared_ptr<const Film> film, std::shared_ptr<Job>);
        std::string summary () const;
        std::string technical_summary () const;
        void as_xml (xmlpp::Node *, bool with_paths) const;
-       DCPTime full_length (boost::shared_ptr<const Film> film) const;
-       DCPTime approximate_length () const;
+       dcpomatic::DCPTime full_length (std::shared_ptr<const Film> film) const;
+       dcpomatic::DCPTime approximate_length () const;
 
        std::string identifier () const;
 
@@ -51,7 +51,7 @@ public:
        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;
 
        boost::optional<boost::filesystem::path> _path_to_scan;
 };