Rename ProRes export format to MOV / ProRes (#2067).

[dcpomatic.git] / src / wx / gl_video_view.h

diff --git a/src/wx/gl_video_view.h b/src/wx/gl_video_view.h
index e1a7fc1acdba7b3237b50b163f355c3714b31ba3..36edd6b8b979111285a7df2dcc4421efbd37c0f1 100644 (file)
--- 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,28 +47,28 @@ 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 check_for_butler_errors ();
+       void ensure_context ();
+       void size_changed (wxSizeEvent const &);
 
-       /* Mutex for use of _canvas; it's only contended when our ::thread
-          is started up so this may be overkill.
-        */
-       boost::mutex _canvas_mutex;
        wxGLCanvas* _canvas;
        wxGLContext* _context;
 
+       boost::atomic<wxSize> _canvas_size;
+
        GLuint _id;
        boost::optional<dcp::Size> _size;
        bool _have_storage;
@@ -80,5 +80,5 @@ private:
        boost::atomic<bool> _playing;
        boost::atomic<bool> _one_shot;
 
-       boost::shared_ptr<wxTimer> _timer;
+       std::shared_ptr<wxTimer> _timer;
 };