projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix failure to remove markers when the checkbox is unticked.
[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 323047adaca9182fcc237c0dfa6a330aa3f6cfd7..cbb162023c29e402bb0561b0570a62cc0b8a38b7 100644
(file)
--- a/
src/wx/simple_video_view.h
+++ b/
src/wx/simple_video_view.h
@@
-33,25
+33,21
@@
class SimpleVideoView : public VideoView
public:
SimpleVideoView (FilmViewer* viewer, wxWindow* parent);
public:
SimpleVideoView (FilmViewer* viewer, wxWindow* parent);
- 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:
private:
- void set_image (boost::shared_ptr<const Image> image) {
- _image = image;
- }
-
void refresh_panel ();
void paint ();
void timer ();
wxPanel* _panel;
void refresh_panel ();
void paint ();
void timer ();
wxPanel* _panel;
-
boost
::shared_ptr<const Image> _image;
+
std
::shared_ptr<const Image> _image;
wxTimer _timer;
Position<int> _inter_position;
dcp::Size _inter_size;
wxTimer _timer;
Position<int> _inter_position;
dcp::Size _inter_size;