projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add Uwe Dittes as translator.
[dcpomatic.git]
/
src
/
wx
/
player_information.h
diff --git
a/src/wx/player_information.h
b/src/wx/player_information.h
index 84daf020dd01e9a9fccb9a613b069901d656b1e9..0dd6c4ad0e8f9c41f584b90ca43d729afc291dc2 100644
(file)
--- a/
src/wx/player_information.h
+++ b/
src/wx/player_information.h
@@
-18,7
+18,10
@@
*/
*/
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
#include <boost/scoped_ptr.hpp>
class FilmViewer;
#include <boost/scoped_ptr.hpp>
class FilmViewer;
@@
-26,7
+29,7
@@
class FilmViewer;
class PlayerInformation : public wxPanel
{
public:
class PlayerInformation : public wxPanel
{
public:
- PlayerInformation (wxWindow* parent,
ControlFilmViewer*
viewer);
+ PlayerInformation (wxWindow* parent,
std::weak_ptr<FilmViewer>
viewer);
void triggered_update ();
void triggered_update ();
@@
-34,7
+37,7
@@
private:
void periodic_update ();
void periodic_update ();
-
ControlFilmViewer*
_viewer;
+
std::weak_ptr<FilmViewer>
_viewer;
wxSizer* _sizer;
wxStaticText** _dcp;
wxStaticText* _dropped;
wxSizer* _sizer;
wxStaticText** _dcp;
wxStaticText* _dropped;