projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Put the timecode next to the rewind-to-0 button to help avoid mouse-slips (#1234).
[dcpomatic.git]
/
src
/
wx
/
video_view.h
diff --git
a/src/wx/video_view.h
b/src/wx/video_view.h
index 060d982f737c31499fb608f10d3145924a6dcb46..892ffab125d08560fed8542937d36a364322f77f 100644
(file)
--- a/
src/wx/video_view.h
+++ b/
src/wx/video_view.h
@@
-26,16
+26,34
@@
class Image;
class wxWindow;
class Image;
class wxWindow;
+class FilmViewer;
class VideoView
{
public:
class VideoView
{
public:
+ VideoView (FilmViewer* viewer)
+ : _viewer (viewer)
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ , _in_watermark (false)
+#endif
+ {}
+
virtual ~VideoView () {}
virtual void set_image (boost::shared_ptr<const Image> image) = 0;
virtual wxWindow* get () const = 0;
virtual ~VideoView () {}
virtual void set_image (boost::shared_ptr<const Image> image) = 0;
virtual wxWindow* get () const = 0;
+ virtual void update () = 0;
boost::signals2::signal<void()> Sized;
boost::signals2::signal<void()> Sized;
+
+protected:
+ FilmViewer* _viewer;
+
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ bool _in_watermark;
+ int _watermark_x;
+ int _watermark_y;
+#endif
};
#endif
};
#endif