Add FilmViewer::time_until_next_frame.

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

diff --git a/src/wx/video_view.h b/src/wx/video_view.h
index af6655ec4b9bf03481abb5dc61f3ca817d98cfeb..f4a8ea22bcf1b4c13087c2cfcc92ba13c9bb6ad8 100644 (file)
--- a/src/wx/video_view.h
+++ b/src/wx/video_view.h
@@ -21,18 +21,23 @@
 #ifndef DCPOMATIC_VIDEO_VIEW_H
 #define DCPOMATIC_VIDEO_VIEW_H
 
+#include "lib/dcpomatic_time.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
 
 class Image;
 class wxWindow;
 class FilmViewer;
+class PlayerVideo;
 
 class VideoView
 {
 public:
        VideoView (FilmViewer* viewer)
                : _viewer (viewer)
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+               , _in_watermark (false)
+#endif
        {}
 
        virtual ~VideoView () {}
@@ -41,10 +46,32 @@ public:
        virtual wxWindow* get () const = 0;
        virtual void update () = 0;
 
+       /* XXX_b: make pure */
+       virtual void start () {}
+
+       void clear ();
+
        boost::signals2::signal<void()> Sized;
 
+       /* XXX_b: to remove */
+       virtual bool get (bool) {
+               return true;
+       }
+       /* XXX_b: to remove */
+       virtual void display_player_video () {}
+
 protected:
+       /* XXX_b: to remove */
+       friend class FilmViewer;
+
        FilmViewer* _viewer;
+       std::pair<boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> _player_video;
+
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+       bool _in_watermark;
+       int _watermark_x;
+       int _watermark_y;
+#endif
 };
 
 #endif