Same thing with inter_size.

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

diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc
index 135892e07c8d3042c61c8c177d39858daec0b4e9..c8fe7b9ad8a8a54aab3fe60a14c8cc53bd42bafe 100644 (file)
--- a/src/wx/simple_video_view.cc
+++ b/src/wx/simple_video_view.cc
@@ -125,12 +125,10 @@ SimpleVideoView::paint ()
        }
 
        if (_viewer->outline_content()) {
-               Position<int> inter_position = _viewer->inter_position ();
-               dcp::Size inter_size = _viewer->inter_size ();
                wxPen p (wxColour (255, 0, 0), 2);
                dc.SetPen (p);
                dc.SetBrush (*wxTRANSPARENT_BRUSH);
-               dc.DrawRectangle (inter_position.x, inter_position.y + (panel_size.GetHeight() - out_size.height) / 2, inter_size.width, inter_size.height);
+               dc.DrawRectangle (_inter_position.x, _inter_position.y + (panel_size.GetHeight() - out_size.height) / 2, _inter_size.width, _inter_size.height);
        }
         _viewer->state_timer().unset();
 }
@@ -169,6 +167,7 @@ SimpleVideoView::timer ()
 void
 SimpleVideoView::start ()
 {
+       VideoView::start ();
        timer ();
 }
 
@@ -194,6 +193,12 @@ SimpleVideoView::display_next_frame (bool non_blocking)
 
        display_player_video ();
 
+       try {
+               _viewer->butler()->rethrow ();
+       } catch (DecodeError& e) {
+               error_dialog (get(), e.what());
+       }
+
        return true;
 }
 
@@ -206,11 +211,11 @@ SimpleVideoView::display_player_video ()
                return;
        }
 
-       if (_viewer->playing() && (_viewer->time() - player_video().second) > _viewer->one_video_frame()) {
+       if (_viewer->playing() && (_viewer->time() - player_video().second) > one_video_frame()) {
                /* Too late; just drop this frame before we try to get its image (which will be the time-consuming
                   part if this frame is J2K).
                */
-               ++_viewer->_dropped;
+               add_dropped ();
                return;
        }
 
@@ -242,8 +247,8 @@ SimpleVideoView::display_player_video ()
        _viewer->ImageChanged (player_video().first);
        _viewer->_state_timer.unset ();
 
-       _viewer->_inter_position = player_video().first->inter_position ();
-       _viewer->_inter_size = player_video().first->inter_size ();
+       _inter_position = player_video().first->inter_position ();
+       _inter_size = player_video().first->inter_size ();
 
        _viewer->refresh_view ();