Merge branch 'better-gl' into v2.15.x

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

diff --git a/src/lib/butler.h b/src/lib/butler.h
index 29966b956b2b491d7c7d82c85f2adc5128842927..cd3891754be508c51603b8b343e3069a3a95481a 100644 (file)
--- a/src/lib/butler.h
+++ b/src/lib/butler.h
@@ -18,6 +18,7 @@
 
 */
 
+
 #include "audio_mapping.h"
 #include "audio_ring_buffers.h"
 #include "change_signaller.h"
@@ -29,9 +30,11 @@
 #include <boost/thread.hpp>
 #include <boost/thread/condition.hpp>
 
+
 class Player;
 class PlayerVideo;
 
+
 class Butler : public ExceptionStore
 {
 public:
@@ -42,8 +45,9 @@ public:
                int audio_channels,
                std::function<AVPixelFormat (AVPixelFormat)> pixel_format,
                VideoRange video_range,
-               bool aligned,
-               bool fast
+               Image::Alignment alignment,
+               bool fast,
+               bool prepare_only_proxy
                );
 
        ~Butler ();
@@ -121,9 +125,17 @@ private:
 
        std::function<AVPixelFormat (AVPixelFormat)> _pixel_format;
        VideoRange _video_range;
-       bool _aligned;
+       Image::Alignment _alignment;
        bool _fast;
 
+       /** true to ask PlayerVideo::prepare to only prepare the ImageProxy and not also
+        *  the final image.  We want to do this when the viewer is intending to call
+        *  PlayerVideo::raw_image() and do the things in PlayerVideo::make_imgae() itself:
+        *  this is the case for the GLVideoView which can do scale, pixfmt conversion etc.
+        *  in the shader.
+        */
+       bool _prepare_only_proxy = false;
+
        /** If we are waiting to be refilled following a seek, this is the time we were
            seeking to.
        */