Fix white space.
[dcpomatic.git] / src / wx / video_view.cc
index 014524757169cfad6140ee5b541f2a6ab0f46856..b0e16737c9c91ebbe88c4b4c8777869c1c0aef9d 100644 (file)
@@ -38,6 +38,7 @@ VideoView::VideoView (FilmViewer* viewer)
        , _eyes (EYES_LEFT)
        , _three_d (false)
        , _dropped (0)
+       , _errored (0)
        , _gets (0)
 {
 
@@ -72,10 +73,11 @@ VideoView::get_next_frame (bool non_blocking)
 
        do {
                Butler::Error e;
-               _player_video = butler->get_video (!non_blocking, &e);
-               if (!_player_video.first && e == Butler::AGAIN) {
+               pair<shared_ptr<PlayerVideo>, dcpomatic::DCPTime> pv = butler->get_video (!non_blocking, &e);
+               if (!pv.first && e == Butler::AGAIN) {
                        return false;
                }
+               _player_video = pv;
        } while (
                _player_video.first &&
                _three_d &&
@@ -83,6 +85,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;
 }
 
@@ -114,6 +120,7 @@ VideoView::start ()
 {
        boost::mutex::scoped_lock lm (_mutex);
        _dropped = 0;
+       _errored = 0;
 }
 
 bool