X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fbutler.h;h=c7e71658da25889107d033147e62b16897f92f4d;hb=1a721b82d4094c00ee89574e17c58c23c0de8cdd;hp=498af8d86af821f9bd3c52db0d0d936b8171e40a;hpb=3fecd33dc2fd14ed487cb14bf9647ee5c0572868;p=dcpomatic.git

diff --git a/src/lib/butler.h b/src/lib/butler.h
index 498af8d86..c7e71658d 100644
--- a/src/lib/butler.h
+++ b/src/lib/butler.h
@@ -72,8 +72,13 @@ 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);
+	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 ();