X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fsimple_video_view.cc;h=117eee2181241768990be4adecb5c24ca5c03c49;hb=a332bd6be323f03dad5b180fb237afe54f1bf81e;hp=e349b865cf03185531318a20eae95a7bda40bf29;hpb=89e92b3e7effafd2ca3aa1e9300777f2d2fb6183;p=dcpomatic.git

diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc
index e349b865c..117eee218 100644
--- a/src/wx/simple_video_view.cc
+++ b/src/wx/simple_video_view.cc
@@ -33,8 +33,12 @@ using std::max;
 using std::string;
 using boost::optional;
 using boost::shared_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 using namespace dcpomatic;
 
+
 SimpleVideoView::SimpleVideoView (FilmViewer* viewer, wxWindow* parent)
 	: VideoView (viewer)
 {
@@ -62,19 +66,6 @@ SimpleVideoView::paint ()
 	dcp::Size const out_size = _viewer->out_size ();
 	wxSize const panel_size = _panel->GetSize ();
 
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-	if (_viewer->background_image()) {
-		dc.Clear ();
-		optional<boost::filesystem::path> bg = Config::instance()->player_background_image();
-		if (bg) {
-			wxImage image (std_to_wx(bg->string()));
-			wxBitmap bitmap (image);
-			dc.DrawBitmap (bitmap, max(0, (panel_size.GetWidth() - image.GetSize().GetWidth()) / 2), max(0, (panel_size.GetHeight() - image.GetSize().GetHeight()) / 2));
-		}
-		return;
-	}
-#endif
-
 	if (!out_size.width || !out_size.height || !_image || out_size != _image->size()) {
 		dc.Clear ();
 	} else {
@@ -82,27 +73,6 @@ SimpleVideoView::paint ()
 		wxImage frame (out_size.width, out_size.height, _image->data()[0], true);
 		wxBitmap frame_bitmap (frame);
 		dc.DrawBitmap (frame_bitmap, 0, max(0, (panel_size.GetHeight() - out_size.height) / 2));
-
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-		DCPTime const period = DCPTime::from_seconds(Config::instance()->player_watermark_period() * 60);
-		int64_t n = _viewer->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 (!_in_watermark) {
-				_in_watermark = true;
-				_watermark_x = rand() % panel_size.GetWidth();
-				_watermark_y = rand() % panel_size.GetHeight();
-			}
-			dc.SetTextForeground(*wxWHITE);
-			string wm = Config::instance()->player_watermark_theatre();
-			boost::posix_time::ptime t = boost::posix_time::second_clock::local_time();
-			wm += "\n" + boost::posix_time::to_iso_extended_string(t);
-			dc.DrawText(std_to_wx(wm), _watermark_x, _watermark_y);
-		} else {
-			_in_watermark = false;
-		}
-#endif
 	}
 
 	if (out_size.width < panel_size.GetWidth()) {
@@ -130,6 +100,15 @@ SimpleVideoView::paint ()
 		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);
 	}
+
+	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();
 }
 
@@ -150,16 +129,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().get_value_or(0), wxTIMER_ONE_SHOT);
+	LOG_DEBUG_VIDEO_VIEW("%1 -> %2; delay %3", next.seconds(), _viewer->time().seconds(), max((next.seconds() - _viewer->time().seconds()) * 1000, 1.0));
+	_timer.Start (max(1, time_until_next_frame().get_value_or(0)), wxTIMER_ONE_SHOT);
 
 	if (_viewer->butler()) {
 		_viewer->butler()->rethrow ();
@@ -242,11 +220,11 @@ SimpleVideoView::update ()
 	_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), VIDEO_RANGE_FULL, false, true)
 		);
 
 	_state_timer.set ("ImageChanged");
-	_viewer->ImageChanged (player_video().first);
+	_viewer->image_changed (player_video().first);
 	_state_timer.unset ();
 
 	_inter_position = player_video().first->inter_position ();