Basic watermark.

diff --git a/src/lib/config.h b/src/lib/config.h
index 8ddc0367de9b9a0290b09b3058b60e8c8ec2a8ca..629828da9ea39b459168221f3ff7ffb800d5b36a 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -1188,7 +1188,9 @@ private:
        boost::optional<boost::filesystem::path> _player_background_image;
        std::string _kdm_server_url;
        std::string _player_watermark_theatre;
+       /** watermark period in minutes */
        int _player_watermark_period;
+       /** watermark duration in milliseconds */
        int _player_watermark_duration;
 #endif
 

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 0f18f2e722433d382513764362356aa971803c7c..54de78f275dea0dc32d37de69d7ac03861f264b2 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -85,6 +85,9 @@ FilmViewer::FilmViewer (wxWindow* p)
        , _closed_captions_dialog (new ClosedCaptionsDialog(p))
        , _outline_content (false)
        , _eyes (EYES_LEFT)
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+       , _in_watermark (false)
+#endif
 {
 #ifndef __WXOSX__
        _panel->SetDoubleBuffered (true);
@@ -328,7 +331,21 @@ FilmViewer::paint_panel ()
        dc.DrawBitmap (frame_bitmap, 0, max(0, (_panel_size.height - _out_size.height) / 2));
 
 #ifdef DCPOMATIC_VARIANT_SWAROOP
-       /* XXX: watermark */
+       DCPTime const period = DCPTime::from_seconds(Config::instance()->player_watermark_period() * 60);
+       int64_t n = _video_position.get() / period.get();
+       DCPTime from(n * period.get());
+       DCPTime to = from + DCPTime::from_seconds(Config::instance()->player_watermark_duration() / 1000.0);
+       if (from <= _video_position && _video_position <= to) {
+               if (!_in_watermark) {
+                       _in_watermark = true;
+                       _watermark_x = rand() % _panel_size.width;
+                       _watermark_y = rand() % _panel_size.height;
+               }
+               dc.SetTextForeground(*wxWHITE);
+               dc.DrawText(std_to_wx(Config::instance()->player_watermark_theatre()), _watermark_x, _watermark_y);
+       } else {
+               _in_watermark = false;
+       }
 #endif
 
        if (_out_size.width < _panel_size.width) {

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 94690daea296f5b82f6e590c5db2b2f5b56553f5..ef124fad3ba7cad176a8c30ef21a56d4c8e39320 100644 (file)
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -154,5 +154,11 @@ private:
        bool _outline_content;
        Eyes _eyes;
 
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+       bool _in_watermark;
+       int _watermark_x;
+       int _watermark_y;
+#endif
+
        boost::signals2::scoped_connection _config_changed_connection;
 };