projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x
[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 e8bb932e44ad3933c769c770ecaea3413b60436f..a6a5cf47f1783b44235c9d771c6d359ff642b6d6 100644
(file)
--- a/
src/wx/simple_video_view.h
+++ b/
src/wx/simple_video_view.h
@@
-19,6
+19,8
@@
*/
#include "video_view.h"
*/
#include "video_view.h"
+#include "lib/position.h"
+#include <dcp/types.h>
#include <wx/wx.h>
class FilmViewer;
#include <wx/wx.h>
class FilmViewer;
@@
-41,11
+43,13
@@
public:
bool display_next_frame (bool non_blocking);
private:
bool display_next_frame (bool non_blocking);
private:
+ void refresh_panel ();
void paint ();
void timer ();
void paint ();
void timer ();
- void display_player_video ();
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;
};
};