X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fsimple_video_view.h;h=31756b5d85eceecbe62a693a5ed524adeb6edf5f;hb=0d40a51371f10ae75824c8e901ce340665163493;hp=a6a5cf47f1783b44235c9d771c6d359ff642b6d6;hpb=166f44ff1b500f684417d660bb349d35383996ee;p=dcpomatic.git

diff --git a/src/wx/simple_video_view.h b/src/wx/simple_video_view.h
index a6a5cf47f..31756b5d8 100644
--- 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,25 @@ 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 ();
-	bool display_next_frame (bool non_blocking);
+	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 ();
 
 	wxPanel* _panel;
-	boost::shared_ptr<const Image> _image;
+	std::shared_ptr<const Image> _image;
 	wxTimer _timer;
 	Position<int> _inter_position;
 	dcp::Size _inter_size;