Work around deadlock when destroying J2KEncoder with a full writer queue (#2784).

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

diff --git a/src/lib/butler.h b/src/lib/butler.h
index 529b7383d0b30a9fb84cef51302a26f6ac60cbca..6bb0467af1f526ed5670dde6237511c47cc0f8df 100644 (file)
--- a/src/lib/butler.h
+++ b/src/lib/butler.h
@@ -19,11 +19,16 @@
 */
 
 
+#ifndef DCPOMATIC_BUTLER_H
+#define DCPOMATIC_BUTLER_H
+
+
 #include "audio_mapping.h"
 #include "audio_ring_buffers.h"
 #include "change_signaller.h"
 #include "exception_store.h"
 #include "text_ring_buffers.h"
+#include "text_type.h"
 #include "video_ring_buffers.h"
 #include <boost/asio.hpp>
 #include <boost/signals2.hpp>
@@ -38,16 +43,23 @@ class PlayerVideo;
 class Butler : public ExceptionStore
 {
 public:
+       enum class Audio
+       {
+               ENABLED,
+               DISABLED
+       };
+
        Butler (
                std::weak_ptr<const Film> film,
-               std::shared_ptr<Player> player,
+               Player& player,
                AudioMapping map,
                int audio_channels,
                std::function<AVPixelFormat (AVPixelFormat)> pixel_format,
                VideoRange video_range,
                Image::Alignment alignment,
                bool fast,
-               bool prepare_only_proxy
+               bool prepare_only_proxy,
+               Audio audio
                );
 
        ~Butler ();
@@ -78,11 +90,9 @@ public:
        };
 
        std::pair<std::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> get_video (Behaviour behaviour, Error* e = nullptr);
-       boost::optional<dcpomatic::DCPTime> get_audio (float* out, Frame frames);
+       boost::optional<dcpomatic::DCPTime> get_audio (Behaviour behaviour, float* out, Frame frames);
        boost::optional<TextRingBuffers::Data> get_closed_caption ();
 
-       void disable_audio ();
-
        std::pair<size_t, std::string> memory_used () const;
 
 private:
@@ -96,7 +106,7 @@ private:
        void seek_unlocked (dcpomatic::DCPTime position, bool accurate);
 
        std::weak_ptr<const Film> _film;
-       std::shared_ptr<Player> _player;
+       Player& _player;
        boost::thread _thread;
 
        VideoRingBuffers _video;
@@ -131,7 +141,7 @@ private:
 
        /** 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:
+        *  PlayerVideo::raw_image() and do the things in PlayerVideo::make_image() itself:
         *  this is the case for the GLVideoView which can do scale, pixfmt conversion etc.
         *  in the shader.
         */
@@ -147,3 +157,7 @@ private:
        boost::signals2::scoped_connection _player_text_connection;
        boost::signals2::scoped_connection _player_change_connection;
 };
+
+
+#endif
+