X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_view.cc;h=ac6357e62444ae805b28d4a21116762fd35b6133;hb=471dee40c1476aba2ff0cff7a57b31306c50b93e;hp=1d10beb30b7bd74255ea2e63153c311e12b11bef;hpb=571a29b441ce6fe4a1e35bbcbcf4ea6abc885c22;p=dcpomatic.git

diff --git a/src/wx/video_view.cc b/src/wx/video_view.cc
index 1d10beb30..ac6357e62 100644
--- a/src/wx/video_view.cc
+++ b/src/wx/video_view.cc
@@ -75,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 (
@@ -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();