Enable TYPE_DISK logging by default.

[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 aa77003a4f9169c90bbf47471806700369f6b96e..4fca899f49626c92223691e010f97df221a2bb37 100644 (file)
--- a/src/lib/ffmpeg_image_proxy.h
+++ b/src/lib/ffmpeg_image_proxy.h
@@ -19,15 +19,16 @@
 */
 
 #include "image_proxy.h"
-#include <dcp/data.h>
+#include "types.h"
+#include <dcp/array_data.h>
 #include <boost/thread/mutex.hpp>
 #include <boost/filesystem.hpp>
 
 class FFmpegImageProxy : public ImageProxy
 {
 public:
-       explicit FFmpegImageProxy (boost::filesystem::path);
-       explicit FFmpegImageProxy (dcp::Data);
+       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);
 
        Result image (
@@ -43,7 +44,8 @@ public:
        int64_t avio_seek (int64_t const pos, int whence);
 
 private:
-       dcp::Data _data;
+       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.