Barely-functioning GL playback with new arrangement.

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

diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index 1e214beeaaaf1fff6a1b9b06ba087f4b647f9d95..3cd5594097baa42e7a3727ba59c83d6ae0544d18 100644 (file)
--- a/src/lib/player_video.h
+++ b/src/lib/player_video.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -31,6 +31,7 @@ extern "C" {
 }
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
+#include <boost/thread/mutex.hpp>
 
 class Image;
 class ImageProxy;
@@ -53,6 +54,7 @@ public:
                Eyes,
                Part,
                boost::optional<ColourConversion>,
+               VideoRange video_range,
                boost::weak_ptr<Content>,
                boost::optional<Frame>
                );
@@ -116,6 +118,7 @@ private:
        Eyes _eyes;
        Part _part;
        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.
@@ -126,8 +129,14 @@ private:
 
        mutable boost::mutex _mutex;
        mutable boost::shared_ptr<Image> _image;
-       /** crop that was used to make _image */
+       /** _crop that was used to make _image */
        mutable Crop _image_crop;
+       /** _inter_size that was used to make _image */
+       mutable dcp::Size _image_inter_size;
+       /** _out_size that was used to make _image */
+       mutable dcp::Size _image_out_size;
+       /** _fade that was used to make _image */
+       mutable boost::optional<double> _image_fade;
 };
 
 #endif