Check that pango/cairo stuff is created successfully.

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

diff --git a/src/wx/video_view.cc b/src/wx/video_view.cc
index 7eea4b786fba72917e3f9285997767545e88ea74..7805a1fb3e9204085932b9db4f43a507c279121b 100644 (file)
--- a/src/wx/video_view.cc
+++ b/src/wx/video_view.cc
@@ -31,9 +31,6 @@ using boost::optional;
 
 VideoView::VideoView (FilmViewer* viewer)
        : _viewer (viewer)
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-       , _in_watermark (false)
-#endif
        , _state_timer ("viewer")
        , _video_frame_rate (0)
        , _eyes (EYES_LEFT)
@@ -55,18 +52,19 @@ VideoView::clear ()
 
 /** Could be called from any thread.
  *  @param non_blocking true to return false quickly if no video is available quickly.
- *  @return false if we gave up because it would take too long, otherwise true.
+ *  @return FAIL if there's no frame, AGAIN if the method should be called again, or SUCCESS
+ *  if there is a frame.
  */
-bool
+VideoView::NextFrameResult
 VideoView::get_next_frame (bool non_blocking)
 {
        if (length() == dcpomatic::DCPTime()) {
-               return true;
+               return FAIL;
        }
 
        shared_ptr<Butler> butler = _viewer->butler ();
        if (!butler) {
-               return false;
+               return FAIL;
        }
        add_get ();
 
@@ -78,8 +76,8 @@ VideoView::get_next_frame (bool non_blocking)
                if (e.code == Butler::Error::DIED) {
                        LOG_ERROR ("Butler died with %1", e.summary());
                }
-               if (!pv.first && e.code == Butler::Error::AGAIN) {
-                       return false;
+               if (!pv.first) {
+                       return e.code == Butler::Error::AGAIN ? AGAIN : FAIL;
                }
                _player_video = pv;
        } while (
@@ -93,7 +91,7 @@ VideoView::get_next_frame (bool non_blocking)
                ++_errored;
        }
 
-       return true;
+       return SUCCESS;
 }
 
 dcpomatic::DCPTime
@@ -128,14 +126,14 @@ VideoView::start ()
 }
 
 bool
-VideoView::refresh_metadata (shared_ptr<const Film> film, dcp::Size video_container_size, dcp::Size film_frame_size)
+VideoView::reset_metadata (shared_ptr<const Film> film, dcp::Size player_video_container_size)
 {
        pair<shared_ptr<PlayerVideo>, dcpomatic::DCPTime> pv = player_video ();
        if (!pv.first) {
                return false;
        }
 
-       if (!pv.first->reset_metadata (film, video_container_size, film_frame_size)) {
+       if (!pv.first->reset_metadata(film, player_video_container_size)) {
                return false;
        }