projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use libdcp's warnings.h
[dcpomatic.git]
/
src
/
wx
/
player_information.h
diff --git
a/src/wx/player_information.h
b/src/wx/player_information.h
index 747cd5a20a0acd12ea03c6795541683c7eb0fe4a..269a9e6c7357555167fc6f7c6e585fbaeacf799a 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,
std::weak_ptr<FilmViewer>
viewer);
void triggered_update ();
void triggered_update ();
@@
-34,7
+40,7
@@
private:
void periodic_update ();
void periodic_update ();
-
FilmViewer*
_viewer;
+
std::weak_ptr<FilmViewer>
_viewer;
wxSizer* _sizer;
wxStaticText** _dcp;
wxStaticText* _dropped;
wxSizer* _sizer;
wxStaticText** _dcp;
wxStaticText* _dropped;