Use EnumIndexedVector in J2KEncoder.

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

diff --git a/src/lib/butler.h b/src/lib/butler.h
index 498af8d86af821f9bd3c52db0d0d936b8171e40a..87408646bc28e3e458e23f75757cc5a81b80da44 100644 (file)
--- a/src/lib/butler.h
+++ b/src/lib/butler.h
@@ -38,6 +38,12 @@ class PlayerVideo;
 class Butler : public ExceptionStore
 {
 public:
+       enum class Audio
+       {
+               ENABLED,
+               DISABLED
+       };
+
        Butler (
                std::weak_ptr<const Film> film,
                std::shared_ptr<Player> player,
@@ -47,7 +53,8 @@ public:
                VideoRange video_range,
                Image::Alignment alignment,
                bool fast,
-               bool prepare_only_proxy
+               bool prepare_only_proxy,
+               Audio audio
                );
 
        ~Butler ();
@@ -72,11 +79,14 @@ public:
                std::string summary () const;
        };
 
-       std::pair<std::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> get_video (bool blocking, Error* e = 0);
-       boost::optional<dcpomatic::DCPTime> get_audio (float* out, Frame frames);
-       boost::optional<TextRingBuffers::Data> get_closed_caption ();
+       enum class Behaviour {
+               BLOCKING,
+               NON_BLOCKING
+       };
 
-       void disable_audio ();
+       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 ();
 
        std::pair<size_t, std::string> memory_used () const;
 
@@ -126,7 +136,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.
         */