X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=7994601ea9d823a2e4f29857b0c0b057fdcd3d21;hp=973189178fb083189e1583d9c372fc98fbacd2e9;hb=5de2fd90b92829cea8ab297c6fce81c582332cb7;hpb=cb0a41355327f0308e5b56c21bff1d1ac004a9cb;ds=sidebyside

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 973189178..7994601ea 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -91,7 +91,6 @@ FilmViewer::FilmViewer (wxWindow* p)
 	, _eyes (EYES_LEFT)
 	, _pad_black (false)
 #ifdef DCPOMATIC_VARIANT_SWAROOP
-	, _in_watermark (false)
 	, _background_image (false)
 #endif
 	, _state_timer ("viewer")
@@ -325,28 +324,6 @@ FilmViewer::timer ()
 	}
 }
 
-bool
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-XXX
-FilmViewer::maybe_draw_background_image (wxPaintDC& dc)
-{
-	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;
-	}
-
-	return false;
-}
-#else
-FilmViewer::maybe_draw_background_image (wxPaintDC &)
-{
-	return false;
-}
-#endif
-
 void
 FilmViewer::set_outline_content (bool o)
 {