projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Put Image into the dcpomatic namespace.
[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 a6a5cf47f1783b44235c9d771c6d359ff642b6d6..ba7fc81f82e26b28a32b2e41e87bedeb8cfc9fb8 100644
(file)
--- a/
src/wx/simple_video_view.h
+++ b/
src/wx/simple_video_view.h
@@
-20,8
+20,11
@@
#include "video_view.h"
#include "lib/position.h"
#include "video_view.h"
#include "lib/position.h"
+#include "lib/warnings.h"
#include <dcp/types.h>
#include <dcp/types.h>
+DCPOMATIC_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
class FilmViewer;
class FilmViewer;
@@
-30,17
+33,13
@@
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 {
+ wxWindow* get () const override {
return _panel;
}
return _panel;
}
- void update ();
- void start ();
-
bool display_next_frame (bool non_blocking)
;
+ void update ()
override
;
+ void start ()
override
;
+
NextFrameResult display_next_frame (bool non_blocking) override
;
private:
void refresh_panel ();
private:
void refresh_panel ();
@@
-48,7
+47,7
@@
private:
void timer ();
wxPanel* _panel;
void timer ();
wxPanel* _panel;
-
boost::shared_ptr<const
Image> _image;
+
std::shared_ptr<const dcpomatic::
Image> _image;
wxTimer _timer;
Position<int> _inter_position;
dcp::Size _inter_size;
wxTimer _timer;
Position<int> _inter_position;
dcp::Size _inter_size;