Make _one_shot and _playing atomic.

[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 614393024bfc825231990351d8d589be49ca2cfb..d9e03823b5a506b99374334153a81241434fb25c 100644 (file)
--- a/src/wx/gl_video_view.h
+++ b/src/wx/gl_video_view.h
@@ -20,6 +20,7 @@
 
 #include "video_view.h"
 #include "lib/signaller.h"
+#include "lib/position.h"
 #include <wx/wx.h>
 #include <wx/glcanvas.h>
 #include <dcp/util.h>
@@ -50,25 +51,29 @@ public:
        }
 
 private:
-       void paint ();
-       void draw ();
+       void draw (Position<int> inter_position, dcp::Size inter_size);
        void thread ();
        void request_one_shot ();
        void create ();
        void check_for_butler_errors ();
 
+       /* 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;
 
        GLuint _id;
        boost::optional<dcp::Size> _size;
+       bool _have_storage;
        bool _vsync_enabled;
-       boost::thread* _thread;
+       boost::thread _thread;
 
        boost::mutex _playing_mutex;
-       boost::condition _playing_condition;
-       bool _playing;
-       bool _one_shot;
+       boost::condition _thread_work_condition;
+       boost::atomic<bool> _playing;
+       boost::atomic<bool> _one_shot;
 
        boost::shared_ptr<wxTimer> _timer;
 };