projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Various timing hacks and development.
[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 ba4c7cfdc92df3a32afbc9642f3de5d8264b8fdc..4ad4b1283abd042a849bf52f7fa600002aa9c9e4 100644
(file)
--- a/
src/wx/gl_video_view.h
+++ b/
src/wx/gl_video_view.h
@@
-23,6
+23,7
@@
#include <wx/glcanvas.h>
#include <dcp/util.h>
#include <boost/shared_ptr.hpp>
#include <wx/glcanvas.h>
#include <dcp/util.h>
#include <boost/shared_ptr.hpp>
+#include <boost/thread.hpp>
#undef None
#undef Success
#undef None
#undef Success
@@
-37,18
+38,28
@@
public:
return _canvas;
}
void update ();
return _canvas;
}
void update ();
+ void start ();
+
+ bool display_next_frame (bool);
bool vsync_enabled () const {
return _vsync_enabled;
}
private:
bool vsync_enabled () const {
return _vsync_enabled;
}
private:
- void paint ();
- void draw ();
+ void paint ();
+ void draw ();
+ void thread ();
+ wxGLContext* context () const;
wxGLCanvas* _canvas;
wxGLCanvas* _canvas;
- wxGLContext* _context;
- GLuint _id;
- boost::optional<dcp::Size> _size;
+
+ wxGLContext* _context;
+ mutable boost::mutex _context_mutex;
+
+ GLuint _id;
+ boost::optional<dcp::Size> _size;
bool _vsync_enabled;
bool _vsync_enabled;
+ boost::thread* _thread;
+ bool _one_shot;
};
};