projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
A little thread safety.
[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 4ad4b1283abd042a849bf52f7fa600002aa9c9e4..cf42432a94102a4d35db6d1629a5e9ce37279552 100644
(file)
--- a/
src/wx/gl_video_view.h
+++ b/
src/wx/gl_video_view.h
@@
-19,6
+19,7
@@
*/
#include "video_view.h"
*/
#include "video_view.h"
+#include "lib/signaller.h"
#include <wx/wx.h>
#include <wx/glcanvas.h>
#include <dcp/util.h>
#include <wx/wx.h>
#include <wx/glcanvas.h>
#include <dcp/util.h>
@@
-39,6
+40,7
@@
public:
}
void update ();
void start ();
}
void update ();
void start ();
+ void stop ();
bool display_next_frame (bool);
bool display_next_frame (bool);
@@
-51,6
+53,9
@@
private:
void draw ();
void thread ();
wxGLContext* context () const;
void draw ();
void thread ();
wxGLContext* context () const;
+ bool one_shot () const;
+ void set_one_shot (bool s);
+ dcpomatic::DCPTime one_video_frame () const;
wxGLCanvas* _canvas;
wxGLCanvas* _canvas;
@@
-61,5
+66,6
@@
private:
boost::optional<dcp::Size> _size;
bool _vsync_enabled;
boost::thread* _thread;
boost::optional<dcp::Size> _size;
bool _vsync_enabled;
boost::thread* _thread;
+ mutable boost::mutex _one_shot_mutex;
bool _one_shot;
};
bool _one_shot;
};