Differentiate requested and actual crop.

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

diff --git a/src/wx/simple_video_view.h b/src/wx/simple_video_view.h
index 2eb62ab5f57dc1730e74a6f73c5a7a7143d122ff..cbb162023c29e402bb0561b0570a62cc0b8a38b7 100644 (file)
--- a/src/wx/simple_video_view.h
+++ b/src/wx/simple_video_view.h
@@ -18,17 +18,37 @@
 
 */
 
+#include "video_view.h"
+#include "lib/position.h"
+#include "lib/warnings.h"
+#include <dcp/types.h>
+DCPOMATIC_DISABLE_WARNINGS
+#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
+
+class FilmViewer;
+
 class SimpleVideoView : public VideoView
 {
 public:
-       SimpleVideoView (wxWindow* parent);
-
-       void set_image (boost::shared_ptr<const Image> image);
+       SimpleVideoView (FilmViewer* viewer, wxWindow* parent);
 
-       wxWindow* get () const {
+       wxWindow* get () const override {
                return _panel;
        }
 
+       void update () override;
+       void start () override;
+       NextFrameResult display_next_frame (bool non_blocking) override;
+
 private:
+       void refresh_panel ();
+       void paint ();
+       void timer ();
+
        wxPanel* _panel;
+       std::shared_ptr<const Image> _image;
+       wxTimer _timer;
+       Position<int> _inter_position;
+       dcp::Size _inter_size;
 };