X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fsimple_video_view.cc;h=437aed4fa136f38fe70ab898932d451be7c04c31;hp=6a8a863d71c22a961bb7a62708d48b74782d1fb8;hb=9001a63be211fd8e97431f8fc07c66af01554f5a;hpb=79355249a27ead72bc2bcd0a84e7a280a3d9a826

diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc
index 6a8a863d7..437aed4fa 100644
--- a/src/wx/simple_video_view.cc
+++ b/src/wx/simple_video_view.cc
@@ -56,7 +56,7 @@ SimpleVideoView::SimpleVideoView (FilmViewer* viewer, wxWindow* parent)
 void
 SimpleVideoView::paint ()
 {
-        _viewer->state_timer().set("paint-panel");
+        _state_timer.set("paint-panel");
 	wxPaintDC dc (_panel);
 
 	dcp::Size const out_size = _viewer->out_size ();
@@ -125,20 +125,21 @@ SimpleVideoView::paint ()
 	}
 
 	if (_viewer->outline_content()) {
-		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();
+        _state_timer.unset();
 }
 
 void
 SimpleVideoView::update ()
 {
+	_state_timer.set ("update-view");
 	_panel->Refresh ();
 	_panel->Update ();
+	_state_timer.unset ();
 }
 
 void
@@ -238,20 +239,20 @@ SimpleVideoView::display_player_video ()
 	 * image and convert it (from whatever the user has said it is) to RGB.
 	 */
 
-	_viewer->_state_timer.set ("get image");
+	_state_timer.set ("get image");
 
 	set_image (
 		player_video().first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true)
 		);
 
-	_viewer->_state_timer.set ("ImageChanged");
+	_state_timer.set ("ImageChanged");
 	_viewer->ImageChanged (player_video().first);
-	_viewer->_state_timer.unset ();
+	_state_timer.unset ();
 
 	_inter_position = player_video().first->inter_position ();
-	_viewer->_inter_size = player_video().first->inter_size ();
+	_inter_size = player_video().first->inter_size ();
 
 	_viewer->refresh_view ();
 
-	_viewer->_closed_captions_dialog->update (_viewer->time());
+	_viewer->closed_captions_dialog()->update (_viewer->time());
 }