X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fsimple_video_view.cc;h=5dd47ce4c2d545d8716a541b35156e733d00c606;hb=6cac49dc50dae6b173135df101d532f20031ca70;hp=2e79deee8c1f689f571bc8bf4cb6b471a6a3bcfd;hpb=d1addc203597a892c02bd162585c6a55950ffaf5;p=dcpomatic.git

diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc
index 2e79deee8..5dd47ce4c 100644
--- a/src/wx/simple_video_view.cc
+++ b/src/wx/simple_video_view.cc
@@ -27,12 +27,12 @@
 #include "lib/butler.h"
 #include <dcp/util.h>
 #include <wx/wx.h>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 using std::max;
 using std::string;
 using boost::optional;
-using boost::shared_ptr;
+using std::shared_ptr;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
@@ -63,64 +63,31 @@ SimpleVideoView::paint ()
         _state_timer.set("paint-panel");
 	wxPaintDC dc (_panel);
 
-	dcp::Size const out_size = _viewer->out_size ();
-	wxSize const panel_size = _panel->GetSize ();
+	auto 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()) {
+	dcp::Size out_size;
+	if (!_image) {
 		dc.Clear ();
 	} else {
-
+		out_size = _image->size();
 		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 = position().get() / period.get();
-		DCPTime from(n * period.get());
-		DCPTime to = from + DCPTime::from_seconds(Config::instance()->player_watermark_duration() / 1000.0);
-		if (from <= position() && 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
 	}
 
+	auto pad = pad_colour();
+
 	if (out_size.width < panel_size.GetWidth()) {
-		/* XXX: these colours are right for GNOME; may need adjusting for other OS */
-		wxPen   p (_viewer->pad_black() ? wxColour(0, 0, 0) : wxColour(240, 240, 240));
-		wxBrush b (_viewer->pad_black() ? wxColour(0, 0, 0) : wxColour(240, 240, 240));
+		wxPen   p (pad);
+		wxBrush b (pad);
 		dc.SetPen (p);
 		dc.SetBrush (b);
 		dc.DrawRectangle (out_size.width, 0, panel_size.GetWidth() - out_size.width, panel_size.GetHeight());
 	}
 
 	if (out_size.height < panel_size.GetHeight()) {
-		wxPen   p (_viewer->pad_black() ? wxColour(0, 0, 0) : wxColour(240, 240, 240));
-		wxBrush b (_viewer->pad_black() ? wxColour(0, 0, 0) : wxColour(240, 240, 240));
+		wxPen   p (pad);
+		wxBrush b (pad);
 		dc.SetPen (p);
 		dc.SetBrush (b);
 		int const gap = (panel_size.GetHeight() - out_size.height) / 2;
@@ -129,15 +96,15 @@ SimpleVideoView::paint ()
 	}
 
 	if (_viewer->outline_content()) {
-		wxPen p (wxColour (255, 0, 0), 2);
+		wxPen p (outline_content_colour(), 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);
 	}
 
-	optional<dcpomatic::Rect<double> > subs = _viewer->outline_subtitles();
+	auto subs = _viewer->outline_subtitles();
 	if (subs) {
-		wxPen p (wxColour(0, 255, 0), 2);
+		wxPen p (outline_subtitles_colour(), 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);
@@ -163,7 +130,7 @@ SimpleVideoView::timer ()
 	}
 
 	display_next_frame (false);
-	DCPTime const next = position() + _viewer->one_video_frame();
+	auto const next = position() + _viewer->one_video_frame();
 
 	if (next >= length()) {
 		_viewer->finished ();
@@ -190,19 +157,12 @@ SimpleVideoView::start ()
  *  false to ask the butler to block until it has video (unless it is suspended).
  *  @return true on success, false if we did nothing because it would have taken too long.
  */
-bool
+VideoView::NextFrameResult
 SimpleVideoView::display_next_frame (bool non_blocking)
 {
-	bool r = get_next_frame (non_blocking);
-	if (!r) {
-		if (non_blocking) {
-			/* No video available; return saying we failed */
-			return false;
-		} else {
-			/* Player was suspended; come back later */
-			signal_manager->when_idle (boost::bind(&SimpleVideoView::display_next_frame, this, false));
-			return false;
-		}
+	auto const r = get_next_frame (non_blocking);
+	if (r != SUCCESS) {
+		return r;
 	}
 
 	update ();
@@ -213,7 +173,7 @@ SimpleVideoView::display_next_frame (bool non_blocking)
 		error_dialog (get(), e.what());
 	}
 
-	return true;
+	return SUCCESS;
 }
 
 void
@@ -254,7 +214,7 @@ 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), VideoRange::FULL, false, true)
 		);
 
 	_state_timer.set ("ImageChanged");