Move a load of disk writing code to src/lib/ext.cc.

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

diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index 1a4a01d58cd8af449647a7f222a66e83f16b7146..0952eafb95ea880d47d9874a62fd1b58ece7820f 100644 (file)
--- a/src/lib/player_video.h
+++ b/src/lib/player_video.h
@@ -67,8 +67,8 @@ public:
 
        void set_text (PositionImage);
 
-       void prepare (boost::function<AVPixelFormat (AVPixelFormat)> pixel_format, bool aligned, bool fast);
-       boost::shared_ptr<Image> image (boost::function<AVPixelFormat (AVPixelFormat)> pixel_format, bool aligned, bool fast) const;
+       void prepare (boost::function<AVPixelFormat (AVPixelFormat)> pixel_format, VideoRange video_range, bool aligned, bool fast);
+       boost::shared_ptr<Image> image (boost::function<AVPixelFormat (AVPixelFormat)> pixel_format, VideoRange video_range, bool aligned, bool fast) const;
 
        static AVPixelFormat force (AVPixelFormat, AVPixelFormat);
        static AVPixelFormat keep_xyz_or_rgb (AVPixelFormat);
@@ -76,10 +76,10 @@ public:
        void add_metadata (xmlpp::Node* node) const;
        void write_to_socket (boost::shared_ptr<Socket> socket) const;
 
-       bool reset_metadata (boost::shared_ptr<const Film> film, dcp::Size video_container_size, dcp::Size film_frame_size);
+       bool reset_metadata (boost::shared_ptr<const Film> film, dcp::Size player_video_container_size);
 
        bool has_j2k () const;
-       dcp::Data j2k () const;
+       boost::shared_ptr<const dcp::Data> j2k () const;
 
        Eyes eyes () const {
                return _eyes;
@@ -114,7 +114,7 @@ public:
        }
 
 private:
-       void make_image (boost::function<AVPixelFormat (AVPixelFormat)> pixel_format, bool aligned, bool fast) const;
+       void make_image (boost::function<AVPixelFormat (AVPixelFormat)> pixel_format, VideoRange video_range, bool aligned, bool fast) const;
 
        boost::shared_ptr<const ImageProxy> _in;
        Crop _crop;
@@ -126,9 +126,7 @@ private:
        boost::optional<ColourConversion> _colour_conversion;
        VideoRange _video_range;
        boost::optional<PositionImage> _text;
-       /** Content that we came from.  This is so that reset_metadata() can work, and also
-        *  for variant:swaroop's non-skippable ads.
-        */
+       /** Content that we came from.  This is so that reset_metadata() can work. */
        boost::weak_ptr<Content> _content;
        /** Video frame that we came from.  Again, this is for reset_metadata() */
        boost::optional<Frame> _video_frame;