Various alignment tidying/fixups.

[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 86451fa66c5e7f80073e4c648d1a793e7e256ea3..cbb162023c29e402bb0561b0570a62cc0b8a38b7 100644 (file)
--- a/src/wx/simple_video_view.h
+++ b/src/wx/simple_video_view.h
@@ -20,8 +20,11 @@
 
 #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;
 
@@ -30,25 +33,21 @@ class SimpleVideoView : public VideoView
 public:
        SimpleVideoView (FilmViewer* viewer, wxWindow* parent);
 
-       void set_image (boost::shared_ptr<const Image> image) {
-               _image = image;
-       }
-
-       wxWindow* get () const {
+       wxWindow* get () const override {
                return _panel;
        }
 
-       void update ();
-       void start ();
-       bool display_next_frame (bool non_blocking);
+       void update () override;
+       void start () override;
+       NextFrameResult display_next_frame (bool non_blocking) override;
 
 private:
+       void refresh_panel ();
        void paint ();
        void timer ();
-       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;