Work around strange build error on Ubuntu 18.04

[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 a6a5cf47f1783b44235c9d771c6d359ff642b6d6..7a48f8ef839344c452bfae50f77785a08d737e0f 100644 (file)
--- a/src/wx/simple_video_view.h
+++ b/src/wx/simple_video_view.h
@@ -18,29 +18,30 @@
 
 */
 
+
 #include "video_view.h"
 #include "lib/position.h"
 #include <dcp/types.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
 
 class FilmViewer;
 
+
 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 ();
@@ -48,7 +49,7 @@ private:
        void timer ();
 
        wxPanel* _panel;
-       boost::shared_ptr<const Image> _image;
+       std::shared_ptr<const Image> _image;
        wxTimer _timer;
        Position<int> _inter_position;
        dcp::Size _inter_size;