X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fgl_video_view.h;h=d8ee65da63e04d63fc572676d6ff7b9a2c8b24f8;hp=fcf5dbcf251c890ca38945cc708ebbc945628874;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hpb=2da4caba7871455c097c0ed940dd6f2332dbda5d

diff --git a/src/wx/gl_video_view.h b/src/wx/gl_video_view.h
index fcf5dbcf2..d8ee65da6 100644
--- a/src/wx/gl_video_view.h
+++ b/src/wx/gl_video_view.h
@@ -28,11 +28,11 @@ DCPOMATIC_DISABLE_WARNINGS
 DCPOMATIC_ENABLE_WARNINGS
 #include <dcp/util.h>
 #include <boost/atomic.hpp>
-#include <boost/shared_ptr.hpp>
 #include <boost/thread.hpp>
 #include <boost/thread/condition.hpp>
 #undef None
 #undef Success
+#undef Status
 
 class GLVideoView : public VideoView
 {
@@ -47,20 +47,19 @@ public:
 	void start ();
 	void stop ();
 
-	bool display_next_frame (bool);
+	NextFrameResult display_next_frame (bool);
 
 	bool vsync_enabled () const {
 		return _vsync_enabled;
 	}
 
 private:
-	void set_image (boost::shared_ptr<const Image> image);
+	void set_image (std::shared_ptr<const Image> image);
 	void set_image_and_draw ();
 	void draw (Position<int> inter_position, dcp::Size inter_size);
 	void thread ();
 	void thread_playing ();
 	void request_one_shot ();
-	void create ();
 	void check_for_butler_errors ();
 
 	/* Mutex for use of _canvas; it's only contended when our ::thread
@@ -81,5 +80,5 @@ private:
 	boost::atomic<bool> _playing;
 	boost::atomic<bool> _one_shot;
 
-	boost::shared_ptr<wxTimer> _timer;
+	std::shared_ptr<wxTimer> _timer;
 };