Add PixelQuanta to VideoContent.

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

diff --git a/src/lib/butler.h b/src/lib/butler.h
index d31442f6c699b1096a52ba842d22043d571f2b44..cd3891754be508c51603b8b343e3069a3a95481a 100644 (file)
--- a/src/lib/butler.h
+++ b/src/lib/butler.h
@@ -45,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 ();
@@ -80,9 +81,6 @@ public:
        boost::optional<TextRingBuffers::Data> get_closed_caption ();
 
        void disable_audio ();
-       void set_prepare_only_proxy (bool p) {
-               _prepare_only_proxy = p;
-       }
 
        std::pair<size_t, std::string> memory_used () const;
 
@@ -127,7 +125,7 @@ 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