Supporters update.

[dcpomatic.git] / src / wx / video_view.cc

diff --git a/src/wx/video_view.cc b/src/wx/video_view.cc
index 4d80e2535248ceaccc35621bfa6c59435c3768b8..1c645f11f688bd6adab4924c07ad9b0fcd25811c 100644 (file)
--- 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 (