Set up new watermark config.

[dcpomatic.git] / src / wx / film_viewer.cc

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index b116c02454167964b091cc74876c47c3a8b9d726..0f18f2e722433d382513764362356aa971803c7c 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -101,7 +101,6 @@ FilmViewer::FilmViewer (wxWindow* p)
 
        _config_changed_connection = Config::instance()->Changed.connect (bind (&FilmViewer::config_changed, this, _1));
        config_changed (Config::SOUND_OUTPUT);
-       config_changed (Config::PLAYER_WATERMARK);
 }
 
 FilmViewer::~FilmViewer ()
@@ -329,11 +328,7 @@ FilmViewer::paint_panel ()
        dc.DrawBitmap (frame_bitmap, 0, max(0, (_panel_size.height - _out_size.height) / 2));
 
 #ifdef DCPOMATIC_VARIANT_SWAROOP
-       if (_watermark && (_video_position.get() % 960000) == 0) {
-               int x = rand() % (_panel_size.width - _watermark->GetWidth());
-               int y = rand() % (_panel_size.height - _watermark->GetHeight());
-               dc.DrawBitmap (*_watermark, x, y);
-       }
+       /* XXX: watermark */
 #endif
 
        if (_out_size.width < _panel_size.width) {
@@ -580,16 +575,6 @@ void
 FilmViewer::config_changed (Config::Property p)
 {
 #ifdef DCPOMATIC_VARIANT_SWAROOP
-       if (p == Config::PLAYER_WATERMARK) {
-               optional<boost::filesystem::path> f = Config::instance()->player_watermark();
-               if (f) {
-                       _watermark = wxBitmap(wxImage(std_to_wx(f->string())));
-               } else {
-                       _watermark = boost::none;
-               }
-               return;
-       }
-
        if (p == Config::PLAYER_BACKGROUND_IMAGE) {
                refresh_panel ();
                return;