X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fsimple_video_view.cc;h=e71d89412ce732d488d6bf3c55b90c88f90541ff;hp=dcf30cd1a7bdadc0ad2e19805acb2f51d8d6255e;hb=386e25f3b9d3fa59cbdeed458d9b3e0d21e338b8;hpb=86a866d5f3f5bf2fec67d1c813524479c6727eab;ds=sidebyside

diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc
index dcf30cd1a..e71d89412 100644
--- 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,23 +193,29 @@ SimpleVideoView::display_next_frame (bool non_blocking)
 
 	display_player_video ();
 
+	try {
+		_viewer->butler()->rethrow ();
+	} catch (DecodeError& e) {
+		error_dialog (get(), e.what());
+	}
+
 	return true;
 }
 
 void
 SimpleVideoView::display_player_video ()
 {
-	if (!_player_video.first) {
+	if (!player_video().first) {
 		set_image (shared_ptr<Image>());
 		_viewer->refresh_view ();
 		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;
 	}
 
@@ -235,17 +240,17 @@ SimpleVideoView::display_player_video ()
 	_viewer->_state_timer.set ("get image");
 
 	set_image (
-		_player_video.first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true)
+		player_video().first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true)
 		);
 
 	_viewer->_state_timer.set ("ImageChanged");
-	_viewer->ImageChanged (_player_video.first);
+	_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 ();
 
-	_viewer->_closed_captions_dialog->update (_viewer->time());
+	_viewer->closed_captions_dialog()->update (_viewer->time());
 }