C++11 tidying.

[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 1d5242a1ac965263ff0b9ad36799a6e2106e3463..31756b5d85eceecbe62a693a5ed524adeb6edf5f 100644 (file)
--- a/src/wx/simple_video_view.h
+++ b/src/wx/simple_video_view.h
@@ -19,7 +19,12 @@
 */
 
 #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;
 
@@ -28,26 +33,26 @@ class SimpleVideoView : public VideoView
 public:
        SimpleVideoView (FilmViewer* viewer, wxWindow* parent);
 
-       void set_image (boost::shared_ptr<const Image> image) {
-               _image = image;
-       }
-
        wxWindow* get () const {
                return _panel;
        }
 
        void update ();
-
        void start ();
+       NextFrameResult display_next_frame (bool non_blocking);
 
 private:
+       void set_image (std::shared_ptr<const Image> image) {
+               _image = image;
+       }
+
+       void refresh_panel ();
        void paint ();
        void timer ();
-       /* XXX_b: rename this (there's already a get() in the parent) */
-       bool get (bool lazy);
-       void display_player_video ();
 
        wxPanel* _panel;
-       boost::shared_ptr<const Image> _image;
+       std::shared_ptr<const Image> _image;
        wxTimer _timer;
+       Position<int> _inter_position;
+       dcp::Size _inter_size;
 };