Untested watermarking.

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

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index d7b12703ee628495ee648751559a0fc2c3e60e5e..db23182a67e0e46ec87e83bb92c56e6347a35846 100644 (file)
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -80,7 +80,6 @@ public:
        void set_eyes (Eyes e);
 
        void slow_refresh ();
-       bool quick_refresh ();
 
        int dropped () const {
                return _dropped;
@@ -90,27 +89,31 @@ public:
 
        boost::signals2::signal<void (boost::weak_ptr<PlayerVideo>)> ImageChanged;
        boost::signals2::signal<void ()> PositionChanged;
-       boost::signals2::signal<void ()> Started;
-       boost::signals2::signal<void ()> Stopped;
+       boost::signals2::signal<void (DCPTime)> Started;
+       boost::signals2::signal<void (DCPTime)> Stopped;
+       boost::signals2::signal<void (DCPTime)> Seeked;
        boost::signals2::signal<void ()> FilmChanged;
 
+       boost::signals2::signal<bool ()> PlaybackPermitted;
+
 private:
        void paint_panel ();
        void panel_sized (wxSizeEvent &);
        void timer ();
        void calculate_sizes ();
-       void check_play_state ();
        void player_change (ChangeType type, int, bool);
        void get ();
        void display_player_video ();
        void film_change (ChangeType, Film::Property);
-       void timecode_clicked ();
        void recreate_butler ();
        void config_changed (Config::Property);
+
        DCPTime time () const;
        DCPTime uncorrected_time () const;
        Frame average_latency () const;
+
        void refresh_panel ();
+       bool quick_refresh ();
 
        boost::shared_ptr<Film> _film;
        boost::shared_ptr<Player> _player;
@@ -151,5 +154,9 @@ private:
        bool _outline_content;
        Eyes _eyes;
 
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+       boost::optional<wxBitmap> _watermark;
+#endif
+
        boost::signals2::scoped_connection _config_changed_connection;
 };