projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make sure wxWidgets headers are included before any Windows ones.
[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 713f965552321ff13e39025acb640681fcf02192..c543b21fe8cb6804d87d69a270c4bb9903a854ea 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.
@@
-18,17
+18,22
@@
*/
*/
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
+#include <wx/glcanvas.h>
+#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
+
#include "video_view.h"
#include "lib/signaller.h"
#include "lib/position.h"
#include "video_view.h"
#include "lib/signaller.h"
#include "lib/position.h"
-#include <wx/wx.h>
-#include <wx/glcanvas.h>
#include <dcp/util.h>
#include <dcp/util.h>
-#include <boost/
shared_ptr
.hpp>
+#include <boost/
atomic
.hpp>
#include <boost/thread.hpp>
#include <boost/thread/condition.hpp>
#undef None
#undef Success
#include <boost/thread.hpp>
#include <boost/thread/condition.hpp>
#undef None
#undef Success
+#undef Status
class GLVideoView : public VideoView
{
class GLVideoView : public VideoView
{
@@
-43,29
+48,28
@@
public:
void start ();
void stop ();
void start ();
void stop ();
-
bool
display_next_frame (bool);
+
NextFrameResult
display_next_frame (bool);
bool vsync_enabled () const {
return _vsync_enabled;
}
private:
bool vsync_enabled () const {
return _vsync_enabled;
}
private:
- void set_image (
boost
::shared_ptr<const Image> image);
+ void set_image (
std
::shared_ptr<const Image> image);
void set_image_and_draw ();
void draw (Position<int> inter_position, dcp::Size inter_size);
void thread ();
void thread_playing ();
void request_one_shot ();
void set_image_and_draw ();
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 check_for_butler_errors ();
+ void ensure_context ();
+ void size_changed (wxSizeEvent const &);
- /* 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;
wxGLCanvas* _canvas;
wxGLContext* _context;
+ boost::atomic<wxSize> _canvas_size;
+
GLuint _id;
boost::optional<dcp::Size> _size;
bool _have_storage;
GLuint _id;
boost::optional<dcp::Size> _size;
bool _have_storage;
@@
-77,5
+81,5
@@
private:
boost::atomic<bool> _playing;
boost::atomic<bool> _one_shot;
boost::atomic<bool> _playing;
boost::atomic<bool> _one_shot;
-
boost
::shared_ptr<wxTimer> _timer;
+
std
::shared_ptr<wxTimer> _timer;
};
};