Use dcp::file_to_string().

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

diff --git a/src/lib/ffmpeg_image_proxy.h b/src/lib/ffmpeg_image_proxy.h
index 4fca899f49626c92223691e010f97df221a2bb37..21109c9d6f2dccf9baf64f11ebbc3b2ac24618bc 100644 (file)
--- a/src/lib/ffmpeg_image_proxy.h
+++ b/src/lib/ffmpeg_image_proxy.h
@@ -27,17 +27,17 @@
 class FFmpegImageProxy : public ImageProxy
 {
 public:
-       explicit FFmpegImageProxy (boost::filesystem::path, VideoRange video_range);
-       explicit FFmpegImageProxy (dcp::ArrayData, VideoRange video_range);
-       FFmpegImageProxy (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);
+       explicit FFmpegImageProxy (boost::filesystem::path);
+       explicit FFmpegImageProxy (dcp::ArrayData);
+       FFmpegImageProxy (std::shared_ptr<Socket> socket);
 
        Result image (
                boost::optional<dcp::Size> size = boost::optional<dcp::Size> ()
                ) const;
 
        void add_metadata (xmlpp::Node *) const;
-       void write_to_socket (boost::shared_ptr<Socket>) const;
-       bool same (boost::shared_ptr<const ImageProxy> other) const;
+       void write_to_socket (std::shared_ptr<Socket>) const;
+       bool same (std::shared_ptr<const ImageProxy> other) const;
        size_t memory_used () const;
 
        int avio_read (uint8_t* buffer, int const amount);
@@ -45,12 +45,11 @@ public:
 
 private:
        dcp::ArrayData _data;
-       VideoRange _video_range;
        mutable int64_t _pos;
        /** Path of a file that this image came from, if applicable; stored so that
            failed-decode errors can give more detail.
        */
        boost::optional<boost::filesystem::path> _path;
-       mutable boost::shared_ptr<Image> _image;
+       mutable std::shared_ptr<Image> _image;
        mutable boost::mutex _mutex;
 };