X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=90f8c9fd2d885c20c974c13eb96835ade8b6866f;hb=8ae2dcecc765df1a98a5dc686473ac46f5e08c3e;hp=8ac7e4495346275cbc1e8827f791ad59df3278bf;hpb=6c3ec3c0a96fbe60f748d27ae80d492104df86a2;p=dcpomatic.git

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 8ac7e4495..90f8c9fd2 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -86,6 +86,7 @@ FilmViewer::FilmViewer (wxWindow* p)
 	, _closed_captions_dialog (new ClosedCaptionsDialog(p))
 	, _outline_content (false)
 	, _eyes (EYES_LEFT)
+	, _pad_black (false)
 #ifdef DCPOMATIC_VARIANT_SWAROOP
 	, _in_watermark (false)
 #endif
@@ -120,8 +121,9 @@ FilmViewer::set_film (shared_ptr<Film> film)
 	}
 
 	_film = film;
-
-	FilmChanged ();
+	_video_position = DCPTime ();
+	_player_video.first.reset ();
+	_player_video.second = DCPTime ();
 
 	_frame.reset ();
 	_closed_captions_dialog->clear ();
@@ -192,7 +194,7 @@ FilmViewer::recreate_butler ()
 		map.set (dcp::RS,     1, 1 / sqrt(2)); // Rs -> Rt
 	}
 
-	_butler.reset (new Butler (_player, _film->log(), map, _audio_channels));
+	_butler.reset (new Butler(_player, map, _audio_channels, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true));
 	if (!Config::instance()->sound() && !_audio.isStreamOpen()) {
 		_butler->disable_audio ();
 	}
@@ -266,15 +268,11 @@ FilmViewer::display_player_video ()
 	 * The content's specified colour conversion indicates the colourspace
 	 * which the content is in (according to the user).
 	 *
-	 * PlayerVideo::image (bound to PlayerVideo::always_rgb) will take the source
+	 * PlayerVideo::image (bound to PlayerVideo::force) will take the source
 	 * image and convert it (from whatever the user has said it is) to RGB.
 	 */
 
-	_frame = _player_video.first->image (
-		bind (&Log::dcp_log, _film->log().get(), _1, _2),
-		bind (&PlayerVideo::always_rgb, _1),
-		false, true
-		);
+	_frame = _player_video.first->image (bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true);
 
 	ImageChanged (_player_video.first);
 
@@ -300,6 +298,8 @@ FilmViewer::timer ()
 
 	if (next >= _film->length()) {
 		stop ();
+		Finished ();
+		return;
 	}
 
 	_timer.Start (max ((next.seconds() - time().seconds()) * 1000, 1.0), wxTIMER_ONE_SHOT);
@@ -309,6 +309,22 @@ FilmViewer::timer ()
 	}
 }
 
+bool
+FilmViewer::maybe_draw_background_image (wxPaintDC& dc)
+{
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+	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.width - image.GetSize().GetWidth()) / 2), max(0, (_panel_size.height - image.GetSize().GetHeight()) / 2));
+		return true;
+	}
+#endif
+
+	return false;
+}
+
 void
 FilmViewer::paint_panel ()
 {
@@ -316,14 +332,11 @@ FilmViewer::paint_panel ()
 
 	if (!_frame || !_film || !_out_size.width || !_out_size.height || _out_size != _frame->size()) {
 		dc.Clear ();
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-		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.width - image.GetSize().GetWidth()) / 2), max(0, (_panel_size.height - image.GetSize().GetHeight()) / 2));
-		}
-#endif
+		maybe_draw_background_image (dc);
+		return;
+	}
+
+	if (_video_position == DCPTime() && maybe_draw_background_image (dc)) {
 		return;
 	}
 
@@ -353,16 +366,17 @@ FilmViewer::paint_panel ()
 #endif
 
 	if (_out_size.width < _panel_size.width) {
-		wxPen p (_panel->GetParent()->GetBackgroundColour());
-		wxBrush b (_panel->GetParent()->GetBackgroundColour());
+		/* XXX: these colours are right for GNOME; may need adjusting for other OS */
+		wxPen   p (_pad_black ? wxColour(0, 0, 0) : wxColour(240, 240, 240));
+		wxBrush b (_pad_black ? wxColour(0, 0, 0) : wxColour(240, 240, 240));
 		dc.SetPen (p);
 		dc.SetBrush (b);
 		dc.DrawRectangle (_out_size.width, 0, _panel_size.width - _out_size.width, _panel_size.height);
 	}
 
 	if (_out_size.height < _panel_size.height) {
-		wxPen p (_panel->GetParent()->GetBackgroundColour());
-		wxBrush b (_panel->GetParent()->GetBackgroundColour());
+		wxPen   p (_pad_black ? wxColour(0, 0, 0) : wxColour(240, 240, 240));
+		wxBrush b (_pad_black ? wxColour(0, 0, 0) : wxColour(240, 240, 240));
 		dc.SetPen (p);
 		dc.SetBrush (b);
 		int const gap = (_panel_size.height - _out_size.height) / 2;
@@ -374,7 +388,7 @@ FilmViewer::paint_panel ()
 		wxPen p (wxColour (255, 0, 0), 2);
 		dc.SetPen (p);
 		dc.SetBrush (*wxTRANSPARENT_BRUSH);
-		dc.DrawRectangle (_inter_position.x, _inter_position.y, _inter_size.width, _inter_size.height);
+		dc.DrawRectangle (_inter_position.x, _inter_position.y + (_panel_size.height - _out_size.height) / 2, _inter_size.width, _inter_size.height);
 	}
 }
 
@@ -533,7 +547,7 @@ FilmViewer::quick_refresh ()
 		return false;
 	}
 
-	if (!_player_video.first->reset_metadata (_player->video_container_size(), _film->frame_size())) {
+	if (!_player_video.first->reset_metadata (_film, _player->video_container_size(), _film->frame_size())) {
 		return false;
 	}
 
@@ -745,3 +759,9 @@ FilmViewer::seek_by (DCPTime by, bool accurate)
 {
 	seek (_video_position + by, accurate);
 }
+
+void
+FilmViewer::set_pad_black (bool p)
+{
+	_pad_black = p;
+}