X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fsimple_video_view.cc;h=768c320875bc52c9f059cf0c66fc308ee50b629b;hp=7aeb317b281a4fb6811f45fa70db0de6989d182c;hb=8f12e84009d7c2685bb2eeb32665876463d4e6e5;hpb=8993f85b88d6540d32709de704bc2fbcd3bf1d59

diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc
index 7aeb317b2..768c32087 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 ();
@@ -85,10 +85,10 @@ SimpleVideoView::paint ()
 
 #ifdef DCPOMATIC_VARIANT_SWAROOP
 		DCPTime const period = DCPTime::from_seconds(Config::instance()->player_watermark_period() * 60);
-		int64_t n = _viewer->position().get() / period.get();
+		int64_t n = position().get() / period.get();
 		DCPTime from(n * period.get());
 		DCPTime to = from + DCPTime::from_seconds(Config::instance()->player_watermark_duration() / 1000.0);
-		if (from <= _viewer->position() && _viewer->position() <= to) {
+		if (from <= position() && position() <= to) {
 			if (!_in_watermark) {
 				_in_watermark = true;
 				_watermark_x = rand() % panel_size.GetWidth();
@@ -125,21 +125,30 @@ 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();
+
+	optional<dcpomatic::Rect<double> > subs = _viewer->outline_subtitles();
+	if (subs) {
+		wxPen p (wxColour(0, 255, 0), 2);
+		dc.SetPen (p);
+		dc.SetBrush (*wxTRANSPARENT_BRUSH);
+		dc.DrawRectangle (subs->x * out_size.width, subs->y * out_size.height, subs->width * out_size.width, subs->height * out_size.height);
+	}
+
+        _state_timer.unset();
 }
 
 void
-SimpleVideoView::update ()
+SimpleVideoView::refresh_panel ()
 {
+	_state_timer.set ("refresh-panel");
 	_panel->Refresh ();
 	_panel->Update ();
+	_state_timer.unset ();
 }
 
 void
@@ -150,16 +159,15 @@ SimpleVideoView::timer ()
 	}
 
 	display_next_frame (false);
-	DCPTime const next = _viewer->position() + _viewer->one_video_frame();
+	DCPTime const next = position() + _viewer->one_video_frame();
 
 	if (next >= length()) {
-		_viewer->stop ();
-		_viewer->Finished ();
+		_viewer->finished ();
 		return;
 	}
 
 	LOG_DEBUG_PLAYER("%1 -> %2; delay %3", next.seconds(), _viewer->time().seconds(), max((next.seconds() - _viewer->time().seconds()) * 1000, 1.0));
-	_timer.Start (time_until_next_frame(), wxTIMER_ONE_SHOT);
+	_timer.Start (max(1, time_until_next_frame().get_value_or(0)), wxTIMER_ONE_SHOT);
 
 	if (_viewer->butler()) {
 		_viewer->butler()->rethrow ();
@@ -169,6 +177,7 @@ SimpleVideoView::timer ()
 void
 SimpleVideoView::start ()
 {
+	VideoView::start ();
 	timer ();
 }
 
@@ -192,17 +201,23 @@ SimpleVideoView::display_next_frame (bool non_blocking)
 		}
 	}
 
-	display_player_video ();
+	update ();
+
+	try {
+		_viewer->butler()->rethrow ();
+	} catch (DecodeError& e) {
+		error_dialog (get(), e.what());
+	}
 
 	return true;
 }
 
 void
-SimpleVideoView::display_player_video ()
+SimpleVideoView::update ()
 {
 	if (!player_video().first) {
 		set_image (shared_ptr<Image>());
-		_viewer->refresh_view ();
+		refresh_panel ();
 		return;
 	}
 
@@ -210,7 +225,7 @@ SimpleVideoView::display_player_video ()
 		/* 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;
 	}
 
@@ -232,20 +247,18 @@ 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 ();
-
-	_viewer->_inter_position = player_video().first->inter_position ();
-	_viewer->_inter_size = player_video().first->inter_size ();
+	_state_timer.unset ();
 
-	_viewer->refresh_view ();
+	_inter_position = player_video().first->inter_position ();
+	_inter_size = player_video().first->inter_size ();
 
-	_viewer->_closed_captions_dialog->update (_viewer->time());
+	refresh_panel ();
 }