projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add option to set project properties from a DCP loaded as content (#1688).
[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 4f509049b3d4d954b60fd748f36f7188c24f9dff..84d97c751f859bf3f24a7e08fffa9b5a1f9cae54 100644
(file)
--- a/
src/wx/gl_video_view.h
+++ b/
src/wx/gl_video_view.h
@@
-57,13
+57,18
@@
private:
void create ();
void check_for_butler_errors ();
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;
wxGLCanvas* _canvas;
wxGLContext* _context;
GLuint _id;
boost::optional<dcp::Size> _size;
+ bool _have_storage;
bool _vsync_enabled;
bool _vsync_enabled;
- boost::thread
*
_thread;
+ boost::thread _thread;
boost::mutex _playing_mutex;
boost::condition _playing_condition;
boost::mutex _playing_mutex;
boost::condition _playing_condition;