projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix wxWidgets assertion on opening the video filters selector.
[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 31756b5d85eceecbe62a693a5ed524adeb6edf5f..7a48f8ef839344c452bfae50f77785a08d737e0f 100644
(file)
--- a/
src/wx/simple_video_view.h
+++ b/
src/wx/simple_video_view.h
@@
-18,34
+18,32
@@
*/
*/
+
#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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/wx.h>
-
DCPOMATIC
_ENABLE_WARNINGS
+
LIBDCP
_ENABLE_WARNINGS
class FilmViewer;
class FilmViewer;
+
class SimpleVideoView : public VideoView
{
public:
SimpleVideoView (FilmViewer* viewer, wxWindow* parent);
class SimpleVideoView : public VideoView
{
public:
SimpleVideoView (FilmViewer* viewer, wxWindow* parent);
- wxWindow* get () const {
+ wxWindow* get () const
override
{
return _panel;
}
return _panel;
}
- void update ();
- void start ();
- NextFrameResult 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 (std::shared_ptr<const Image> image) {
- _image = image;
- }
-
void refresh_panel ();
void paint ();
void timer ();
void refresh_panel ();
void paint ();
void timer ();