projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hide warnings triggered by Ubuntu 20.04's gcc.
[dcpomatic.git]
/
src
/
wx
/
simple_video_view.h
diff --git
a/src/wx/simple_video_view.h
b/src/wx/simple_video_view.h
index d271416528390ad39b04377614d53098f3791962..323047adaca9182fcc237c0dfa6a330aa3f6cfd7 100644
(file)
--- a/
src/wx/simple_video_view.h
+++ b/
src/wx/simple_video_view.h
@@
-19,7
+19,12
@@
*/
#include "video_view.h"
*/
#include "video_view.h"
+#include "lib/position.h"
+#include "lib/warnings.h"
+#include <dcp/types.h>
+DCPOMATIC_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
class FilmViewer;
class FilmViewer;
@@
-28,24
+33,26
@@
class SimpleVideoView : public VideoView
public:
SimpleVideoView (FilmViewer* viewer, wxWindow* parent);
public:
SimpleVideoView (FilmViewer* viewer, wxWindow* parent);
- void set_image (boost::shared_ptr<const Image> image) {
- _image = image;
- }
-
wxWindow* get () const {
return _panel;
}
void update ();
wxWindow* get () const {
return _panel;
}
void update ();
-
void start ();
void start ();
+ bool display_next_frame (bool non_blocking);
private:
private:
+ void set_image (boost::shared_ptr<const Image> image) {
+ _image = image;
+ }
+
+ void refresh_panel ();
void paint ();
void timer ();
void paint ();
void timer ();
- bool get (bool lazy);
wxPanel* _panel;
boost::shared_ptr<const Image> _image;
wxTimer _timer;
wxPanel* _panel;
boost::shared_ptr<const Image> _image;
wxTimer _timer;
+ Position<int> _inter_position;
+ dcp::Size _inter_size;
};
};