X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=0e47ac1acb47947da199f71430e03d2657c70e07;hb=6e5c998593842ff76f5d0ae5cab0d03cbe11b607;hp=dd088db20fa2d59c0c201b0fdca3e260e64c7ba3;hpb=4050a1278d1916719797d1cf2906a932d0d5f6c2;p=dcpomatic.git

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index dd088db20..0e47ac1ac 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -44,6 +44,7 @@
 #include "lib/log.h"
 #include "lib/config.h"
 #include "lib/compose.hpp"
+#include "lib/dcpomatic_log.h"
 extern "C" {
 #include <libavutil/pixfmt.h>
 }
@@ -89,6 +90,7 @@ FilmViewer::FilmViewer (wxWindow* p)
 	, _pad_black (false)
 #ifdef DCPOMATIC_VARIANT_SWAROOP
 	, _in_watermark (false)
+	, _background_image (false)
 #endif
 {
 #ifndef __WXOSX__
@@ -142,7 +144,7 @@ FilmViewer::set_film (shared_ptr<Film> film)
 		if (_dcp_decode_reduction) {
 			_player->set_dcp_decode_reduction (_dcp_decode_reduction);
 		}
-	} catch (bad_alloc) {
+	} catch (bad_alloc &) {
 		error_dialog (_panel, _("There is not enough free memory to do that."));
 		_film.reset ();
 		return;
@@ -228,7 +230,8 @@ FilmViewer::get ()
 	} while (
 		_player_video.first &&
 		_film->three_d() &&
-		(_eyes != _player_video.first->eyes())
+		_eyes != _player_video.first->eyes() &&
+		_player_video.first->eyes() != EYES_BOTH
 		);
 
 	_butler->rethrow ();
@@ -302,6 +305,7 @@ FilmViewer::timer ()
 		return;
 	}
 
+	LOG_DEBUG_PLAYER("%1 -> %2; delay %3", next.seconds(), time().seconds(), max((next.seconds() - time().seconds()) * 1000, 1.0));
 	_timer.Start (max ((next.seconds() - time().seconds()) * 1000, 1.0), wxTIMER_ONE_SHOT);
 
 	if (_butler) {
@@ -310,9 +314,9 @@ FilmViewer::timer ()
 }
 
 bool
+#ifdef DCPOMATIC_VARIANT_SWAROOP
 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()));
@@ -320,24 +324,31 @@ FilmViewer::maybe_draw_background_image (wxPaintDC& dc)
 		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;
 }
+#else
+FilmViewer::maybe_draw_background_image (wxPaintDC &)
+{
+	return false;
+}
+#endif
 
 void
 FilmViewer::paint_panel ()
 {
 	wxPaintDC dc (_panel);
 
-	if (!_out_size.width || !_out_size.height || !_frame || _out_size != _frame->size()) {
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+	if (_background_image) {
 		dc.Clear ();
+		maybe_draw_background_image (dc);
 		return;
 	}
+#endif
 
-	if (!_film) {
+	if (!_out_size.width || !_out_size.height || !_film || !_frame || _out_size != _frame->size()) {
 		dc.Clear ();
-		maybe_draw_background_image (dc);
 		return;
 	}