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
/
gl_video_view.h
diff --git
a/src/wx/gl_video_view.h
b/src/wx/gl_video_view.h
index 73db3535d2775c7fdc84b46482e7a1143948a4fd..fcf5dbcf251c890ca38945cc708ebbc945628874 100644
(file)
--- a/
src/wx/gl_video_view.h
+++ b/
src/wx/gl_video_view.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 20
19
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 20
20
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-20,11
+20,17
@@
#include "video_view.h"
#include "lib/signaller.h"
#include "video_view.h"
#include "lib/signaller.h"
-#include <wx/wx.h>
+#include "lib/position.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
#include <wx/glcanvas.h>
#include <wx/glcanvas.h>
+#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
#include <dcp/util.h>
#include <dcp/util.h>
+#include <boost/atomic.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/thread.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/thread.hpp>
+#include <boost/thread/condition.hpp>
#undef None
#undef Success
#undef None
#undef Success
@@
-34,7
+40,6
@@
public:
GLVideoView (FilmViewer* viewer, wxWindow* parent);
~GLVideoView ();
GLVideoView (FilmViewer* viewer, wxWindow* parent);
~GLVideoView ();
- void set_image (boost::shared_ptr<const Image> image);
wxWindow* get () const {
return _canvas;
}
wxWindow* get () const {
return _canvas;
}
@@
-49,18
+54,32
@@
public:
}
private:
}
private:
- void paint ();
- void draw ();
+ void set_image (boost::shared_ptr<const Image> image);
+ void set_image_and_draw ();
+ void draw (Position<int> inter_position, dcp::Size inter_size);
void thread ();
void thread ();
- wxGLContext* context () const;
+ void thread_playing ();
+ void request_one_shot ();
+ void create ();
+ void check_for_butler_errors ();
+ /* Mutex for use of _canvas; it's only contended when our ::thread
+ is started up so this may be overkill.
+ */
+ boost::mutex _canvas_mutex;
wxGLCanvas* _canvas;
wxGLCanvas* _canvas;
-
wxGLContext* _context;
wxGLContext* _context;
- mutable boost::mutex _context_mutex;
GLuint _id;
boost::optional<dcp::Size> _size;
GLuint _id;
boost::optional<dcp::Size> _size;
+ bool _have_storage;
bool _vsync_enabled;
bool _vsync_enabled;
- boost::thread* _thread;
+ boost::thread _thread;
+
+ boost::mutex _playing_mutex;
+ boost::condition _thread_work_condition;
+ boost::atomic<bool> _playing;
+ boost::atomic<bool> _one_shot;
+
+ boost::shared_ptr<wxTimer> _timer;
};
};