X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fbutler.h;h=87408646bc28e3e458e23f75757cc5a81b80da44;hb=dba7e1137282b52a1bd6ad1d56fe6371a8c97e30;hp=8c7f554cb800f4ef94a4a40278463748616cc8f8;hpb=e0255a64d22440d718e5512f34a4f21f0d37a21b;p=dcpomatic.git

diff --git a/src/lib/butler.h b/src/lib/butler.h
index 8c7f554cb..87408646b 100644
--- 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,51 +30,63 @@
 #include <boost/thread.hpp>
 #include <boost/thread/condition.hpp>
 
+
 class Player;
 class PlayerVideo;
 
-class Butler : public ExceptionStore, public boost::noncopyable
+
+class Butler : public ExceptionStore
 {
 public:
+	enum class Audio
+	{
+		ENABLED,
+		DISABLED
+	};
+
 	Butler (
 		std::weak_ptr<const Film> film,
 		std::shared_ptr<Player> player,
 		AudioMapping map,
 		int audio_channels,
-		boost::function<AVPixelFormat (AVPixelFormat)> pixel_format,
+		std::function<AVPixelFormat (AVPixelFormat)> pixel_format,
 		VideoRange video_range,
-		bool aligned,
-		bool fast
+		Image::Alignment alignment,
+		bool fast,
+		bool prepare_only_proxy,
+		Audio audio
 		);
 
 	~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<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;
 
@@ -116,11 +129,19 @@ private:
 
 	bool _disable_audio;
 
-	boost::function<AVPixelFormat (AVPixelFormat)> _pixel_format;
+	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_image() 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.
 	*/