From 0e896f9f37db001f34c876ed5fc50e874f96ae09 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 15 Oct 2021 22:26:47 +0200 Subject: Use an enum instead of a bool to specify blocking/non-blocking. --- src/lib/butler.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/lib/butler.cc') diff --git a/src/lib/butler.cc b/src/lib/butler.cc index 6f7349b5f..f19e1e080 100644 --- a/src/lib/butler.cc +++ b/src/lib/butler.cc @@ -238,12 +238,12 @@ try } -/** @param blocking true if we should block until video is available. If blocking is false +/** @param behaviour BLOCKING if we should block until video is available. If behaviour is NON_BLOCKING * and no video is immediately available the method will return a 0 PlayerVideo and the error AGAIN. * @param e if non-0 this is filled with an error code (if an error occurs) or is untouched if no error occurs. */ pair, DCPTime> -Butler::get_video (bool blocking, Error* e) +Butler::get_video (Behaviour behaviour, Error* e) { boost::mutex::scoped_lock lm (_mutex); @@ -260,7 +260,7 @@ Butler::get_video (bool blocking, Error* e) } }; - if (_video.empty() && (_finished || _died || (_suspended && !blocking))) { + if (_video.empty() && (_finished || _died || (_suspended && behaviour == Behaviour::NON_BLOCKING))) { setup_error (e, Error::Code::AGAIN); return make_pair(shared_ptr(), DCPTime()); } -- cgit v1.2.3