Try to improve spacing in Keys tab of prefs on macOS (#1550).

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

diff --git a/src/wx/video_view.cc b/src/wx/video_view.cc
index 4edc2cd23a28cf0f3b943fe3a9d6cb409fecd973..b9c45631edf1f6d583ac429e7473f8063288b773 100644 (file)
--- a/src/wx/video_view.cc
+++ b/src/wx/video_view.cc
@@ -24,6 +24,7 @@
 #include "lib/butler.h"
 #include <boost/optional.hpp>
 
+using std::pair;
 using boost::shared_ptr;
 using boost::optional;
 
@@ -37,6 +38,7 @@ VideoView::VideoView (FilmViewer* viewer)
        , _eyes (EYES_LEFT)
        , _three_d (false)
        , _dropped (0)
+       , _errored (0)
        , _gets (0)
 {
 
@@ -82,6 +84,10 @@ VideoView::get_next_frame (bool non_blocking)
                _player_video.first->eyes() != EYES_BOTH
                );
 
+       if (_player_video.first && _player_video.first->error()) {
+               ++_errored;
+       }
+
        return true;
 }
 
@@ -113,17 +119,18 @@ VideoView::start ()
 {
        boost::mutex::scoped_lock lm (_mutex);
        _dropped = 0;
+       _errored = 0;
 }
 
 bool
 VideoView::refresh_metadata (shared_ptr<const Film> film, dcp::Size video_container_size, dcp::Size film_frame_size)
 {
-       boost::mutex::scoped_lock lm (_mutex);
-       if (!_player_video.first) {
+       pair<shared_ptr<PlayerVideo>, dcpomatic::DCPTime> pv = player_video ();
+       if (!pv.first) {
                return false;
        }
 
-       if (!_player_video.first->reset_metadata (film, video_container_size, film_frame_size)) {
+       if (!pv.first->reset_metadata (film, video_container_size, film_frame_size)) {
                return false;
        }