projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
C++11 tidying.
[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 01434d56915b0e8a03688c59a6075dbbb0c05f52..36edd6b8b979111285a7df2dcc4421efbd37c0f1 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.
@@
-21,14
+21,18
@@
#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 "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
#include <wx/glcanvas.h>
#include <wx/glcanvas.h>
+#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
#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
{
@@
-36,7
+40,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;
}
@@
-44,31
+47,38
@@
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 draw (Position<int> inter_position);
+ 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 ();
+ void thread_playing ();
void request_one_shot ();
void request_one_shot ();
- void create ();
void check_for_butler_errors ();
void check_for_butler_errors ();
+ void ensure_context ();
+ void size_changed (wxSizeEvent const &);
wxGLCanvas* _canvas;
wxGLContext* _context;
wxGLCanvas* _canvas;
wxGLContext* _context;
+ boost::atomic<wxSize> _canvas_size;
+
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;
+
std
::shared_ptr<wxTimer> _timer;
};
};