X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_view.cc;h=c271cb65e83e213edb54f566c5b4098b351b968f;hb=da13c2af9e8f19229061ca1939cbe8bd37c72eba;hp=4d80e2535248ceaccc35621bfa6c59435c3768b8;hpb=7f641936b00ec87b6eea2ef0a5daa1b1710cf9f4;p=dcpomatic.git

diff --git a/src/wx/video_view.cc b/src/wx/video_view.cc
index 4d80e2535..c271cb65e 100644
--- a/src/wx/video_view.cc
+++ b/src/wx/video_view.cc
@@ -28,7 +28,6 @@
 #include <sys/time.h>
 
 
-using std::pair;
 using std::shared_ptr;
 using boost::optional;
 
@@ -76,12 +75,12 @@ VideoView::get_next_frame (bool non_blocking)
 
 	do {
 		Butler::Error e;
-		auto pv = butler->get_video (!non_blocking, &e);
-		if (e.code == Butler::Error::DIED) {
+		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());
 		}
 		if (!pv.first) {
-			return e.code == Butler::Error::AGAIN ? AGAIN : FAIL;
+			return e.code == Butler::Error::Code::AGAIN ? AGAIN : FAIL;
 		}
 		_player_video = pv;
 	} while (
@@ -112,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();
@@ -186,4 +185,3 @@ VideoView::pad_colour () const
 		return wxColour(240, 240, 240);
 	}
 }
-