swaroop: respect skippable/timeline disable even with first piece of content.

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

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 94690daea296f5b82f6e590c5db2b2f5b56553f5..73c923c26c03b2de156bd6b064cc08787c6422e1 100644 (file)
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -78,6 +78,7 @@ public:
        boost::optional<int> dcp_decode_reduction () const;
        void set_outline_content (bool o);
        void set_eyes (Eyes e);
+       void set_pad_black (bool p);
 
        void slow_refresh ();
 
@@ -92,7 +93,8 @@ public:
        boost::signals2::signal<void (DCPTime)> Started;
        boost::signals2::signal<void (DCPTime)> Stopped;
        boost::signals2::signal<void (DCPTime)> Seeked;
-       boost::signals2::signal<void ()> FilmChanged;
+       /** While playing back we reached the end of the film (emitted from GUI thread) */
+       boost::signals2::signal<void ()> Finished;
 
        boost::signals2::signal<bool ()> PlaybackPermitted;
 
@@ -107,6 +109,7 @@ private:
        void film_change (ChangeType, Film::Property);
        void recreate_butler ();
        void config_changed (Config::Property);
+       bool maybe_draw_background_image (wxPaintDC& dc);
 
        DCPTime time () const;
        DCPTime uncorrected_time () const;
@@ -153,6 +156,16 @@ private:
 
        bool _outline_content;
        Eyes _eyes;
+       /** true to pad the viewer panel with black, false to use
+           the normal window background colour.
+       */
+       bool _pad_black;
+
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+       bool _in_watermark;
+       int _watermark_x;
+       int _watermark_y;
+#endif
 
        boost::signals2::scoped_connection _config_changed_connection;
 };