Fix the build for older macOS.

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

diff --git a/src/lib/butler.h b/src/lib/butler.h
index e13843c90e9c14833704cde408e65de072e8e5c9..c7e71658da25889107d033147e62b16897f92f4d 100644 (file)
--- a/src/lib/butler.h
+++ b/src/lib/butler.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2016-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,58 +18,67 @@
 
 */
 
-#include "video_ring_buffers.h"
-#include "audio_ring_buffers.h"
-#include "text_ring_buffers.h"
+
 #include "audio_mapping.h"
+#include "audio_ring_buffers.h"
+#include "change_signaller.h"
 #include "exception_store.h"
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
+#include "text_ring_buffers.h"
+#include "video_ring_buffers.h"
+#include <boost/asio.hpp>
+#include <boost/signals2.hpp>
 #include <boost/thread.hpp>
 #include <boost/thread/condition.hpp>
-#include <boost/signals2.hpp>
-#include <boost/asio.hpp>
+
 
 class Player;
 class PlayerVideo;
 
-class Butler : public ExceptionStore, public boost::noncopyable
+
+class Butler : public ExceptionStore
 {
 public:
        Butler (
-               boost::shared_ptr<Player> player,
+               std::weak_ptr<const Film> film,
+               std::shared_ptr<Player> player,
                AudioMapping map,
                int audio_channels,
-               boost::function<AVPixelFormat (AVPixelFormat)> pixel_format,
-               bool aligned,
-               bool fast
+               std::function<AVPixelFormat (AVPixelFormat)> pixel_format,
+               VideoRange video_range,
+               Image::Alignment alignment,
+               bool fast,
+               bool prepare_only_proxy
                );
 
        ~Butler ();
 
+       Butler (Butler const&) = delete;
+       Butler& operator= (Butler const&) = delete;
+
        void seek (dcpomatic::DCPTime position, bool accurate);
 
        class Error {
        public:
-               enum Code{
+               enum class Code {
                        NONE,
                        AGAIN,
                        DIED,
                        FINISHED
                };
 
-               Error()
-                       : code (NONE)
-               {}
-
-               Code code;
+               Code code = Code::NONE;
                std::string message;
 
                std::string summary () const;
        };
 
-       std::pair<boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> get_video (bool blocking, Error* e = 0);
-       boost::optional<dcpomatic::DCPTime> get_audio (float* out, Frame frames);
+       enum class Behaviour {
+               BLOCKING,
+               NON_BLOCKING
+       };
+
+       std::pair<std::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> get_video (Behaviour behaviour, Error* e = nullptr);
+       boost::optional<dcpomatic::DCPTime> get_audio (Behaviour behaviour, float* out, Frame frames);
        boost::optional<TextRingBuffers::Data> get_closed_caption ();
 
        void disable_audio ();
@@ -78,15 +87,16 @@ public:
 
 private:
        void thread ();
-       void video (boost::shared_ptr<PlayerVideo> video, dcpomatic::DCPTime time);
-       void audio (boost::shared_ptr<AudioBuffers> audio, dcpomatic::DCPTime time, int frame_rate);
+       void video (std::shared_ptr<PlayerVideo> video, dcpomatic::DCPTime time);
+       void audio (std::shared_ptr<AudioBuffers> audio, dcpomatic::DCPTime time, int frame_rate);
        void text (PlayerText pt, TextType type, boost::optional<DCPTextTrack> track, dcpomatic::DCPTimePeriod period);
        bool should_run () const;
-       void prepare (boost::weak_ptr<PlayerVideo> video);
-       void player_change (ChangeType type);
+       void prepare (std::weak_ptr<PlayerVideo> video);
+       void player_change (ChangeType type, int property);
        void seek_unlocked (dcpomatic::DCPTime position, bool accurate);
 
-       boost::shared_ptr<Player> _player;
+       std::weak_ptr<const Film> _film;
+       std::shared_ptr<Player> _player;
        boost::thread _thread;
 
        VideoRingBuffers _video;
@@ -95,7 +105,7 @@ private:
 
        boost::thread_group _prepare_pool;
        boost::asio::io_service _prepare_service;
-       boost::shared_ptr<boost::asio::io_service::work> _prepare_work;
+       std::shared_ptr<boost::asio::io_service::work> _prepare_work;
 
        /** mutex to protect _pending_seek_position, _pending_seek_accurate, _finished, _died, _stop_thread */
        boost::mutex _mutex;
@@ -114,10 +124,19 @@ private:
 
        bool _disable_audio;
 
-       boost::function<AVPixelFormat (AVPixelFormat)> _pixel_format;
-       bool _aligned;
+       std::function<AVPixelFormat (AVPixelFormat)> _pixel_format;
+       VideoRange _video_range;
+       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.
        */