projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Potential Windows build fix.
[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 827b12861c5d47ccb5caadadc668fdbb5b5222b2..3675b8ddcb6025dce1c84b37a917e6b3d7ee2e57 100644
(file)
--- a/
src/wx/gl_video_view.h
+++ b/
src/wx/gl_video_view.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 20
19
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 20
20
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-24,6
+24,7
@@
#include <wx/wx.h>
#include <wx/glcanvas.h>
#include <dcp/util.h>
#include <wx/wx.h>
#include <wx/glcanvas.h>
#include <dcp/util.h>
+#include <boost/atomic.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/thread.hpp>
#include <boost/thread/condition.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/thread.hpp>
#include <boost/thread/condition.hpp>
@@
-36,7
+37,6
@@
public:
GLVideoView (FilmViewer* viewer, wxWindow* parent);
~GLVideoView ();
GLVideoView (FilmViewer* viewer, wxWindow* parent);
~GLVideoView ();
- void set_image (boost::shared_ptr<const Image> image);
wxWindow* get () const {
return _canvas;
}
wxWindow* get () const {
return _canvas;
}
@@
-51,8
+51,11
@@
public:
}
private:
}
private:
+ void set_image (boost::shared_ptr<const Image> image);
+ void set_image_and_draw ();
void draw (Position<int> inter_position, dcp::Size inter_size);
void thread ();
void draw (Position<int> inter_position, dcp::Size inter_size);
void thread ();
+ void thread_playing ();
void request_one_shot ();
void create ();
void check_for_butler_errors ();
void request_one_shot ();
void create ();
void check_for_butler_errors ();
@@
-66,13
+69,14
@@
private:
GLuint _id;
boost::optional<dcp::Size> _size;
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::mutex _playing_mutex;
- boost::condition _
playing
_condition;
- boo
l
_playing;
- boo
l
_one_shot;
+ boost::condition _
thread_work
_condition;
+ boo
st::atomic<bool>
_playing;
+ boo
st::atomic<bool>
_one_shot;
boost::shared_ptr<wxTimer> _timer;
};
boost::shared_ptr<wxTimer> _timer;
};