X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_view.cc;h=c271cb65e83e213edb54f566c5b4098b351b968f;hb=d5c059a2ff9bab5c2973db6bc4860591679dd42b;hp=331095253127896dd0f824c9bef6c0d5a9d01997;hpb=3fecd33dc2fd14ed487cb14bf9647ee5c0572868;p=dcpomatic.git

diff --git a/src/wx/video_view.cc b/src/wx/video_view.cc
index 331095253..c271cb65e 100644
--- a/src/wx/video_view.cc
+++ b/src/wx/video_view.cc
@@ -75,7 +75,7 @@ VideoView::get_next_frame (bool non_blocking)
 
 	do {
 		Butler::Error e;
-		auto pv = butler->get_video (!non_blocking, &e);
+		auto pv = butler->get_video (non_blocking ? Butler::Behaviour::NON_BLOCKING : Butler::Behaviour::BLOCKING, &e);
 		if (e.code == Butler::Error::Code::DIED) {
 			LOG_ERROR ("Butler died with %1", e.summary());
 		}
@@ -111,7 +111,7 @@ VideoView::time_until_next_frame () const
 {
 	if (length() == dcpomatic::DCPTime()) {
 		/* There's no content, so this doesn't matter */
-		return optional<int>();
+		return {};
 	}
 
 	auto const next = position() + one_video_frame();
@@ -185,4 +185,3 @@ VideoView::pad_colour () const
 		return wxColour(240, 240, 240);
 	}
 }
-