projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove C++17-ism.
[dcpomatic.git]
/
src
/
wx
/
player_information.h
diff --git
a/src/wx/player_information.h
b/src/wx/player_information.h
index 7eafeb122cfb25f3f61c3fedce044a4133ab9871..2ce49371431e3f6e8162aedd66105918e22a40d2 100644
(file)
--- a/
src/wx/player_information.h
+++ b/
src/wx/player_information.h
@@
-18,15
+18,21
@@
*/
*/
+
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
#include <boost/scoped_ptr.hpp>
#include <boost/scoped_ptr.hpp>
+
class FilmViewer;
class FilmViewer;
+
class PlayerInformation : public wxPanel
{
public:
class PlayerInformation : public wxPanel
{
public:
- PlayerInformation
(wxWindow* parent, FilmViewer*
viewer);
+ PlayerInformation
(wxWindow* parent, FilmViewer const&
viewer);
void triggered_update ();
void triggered_update ();
@@
-34,11
+40,13
@@
private:
void periodic_update ();
void periodic_update ();
- FilmViewer* _viewer;
+ FilmViewer const& _viewer;
+ wxPanel* _kdm_panel;
wxSizer* _sizer;
wxSizer* _sizer;
- wxStaticText*
_cpl_name
;
- wxStaticText* _
size
;
- wxStaticText* _
length
;
+ wxStaticText*
* _dcp
;
+ wxStaticText* _
kdm_from
;
+ wxStaticText* _
kdm_to
;
wxStaticText* _dropped;
wxStaticText* _dropped;
+ wxStaticText* _decode_resolution;
boost::scoped_ptr<wxTimer> _timer;
};
boost::scoped_ptr<wxTimer> _timer;
};