Try to fix crashes when things go wrong with getDeviceInfo.

[dcpomatic.git] / src / wx / player_information.h

diff --git a/src/wx/player_information.h b/src/wx/player_information.h
index 7eafeb122cfb25f3f61c3fedce044a4133ab9871..ae3e134295f3442694a1dceda5fcff9816f83d32 100644 (file)
--- a/src/wx/player_information.h
+++ b/src/wx/player_information.h
@@ -18,15 +18,19 @@
 
 */
 
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/scoped_ptr.hpp>
+#include <boost/weak_ptr.hpp>
 
 class FilmViewer;
 
 class PlayerInformation : public wxPanel
 {
 public:
-       PlayerInformation (wxWindow* parent, FilmViewer* viewer);
+       PlayerInformation (wxWindow* parent, boost::weak_ptr<FilmViewer> viewer);
 
        void triggered_update ();
 
@@ -34,11 +38,10 @@ private:
 
        void periodic_update ();
 
-       FilmViewer* _viewer;
+       boost::weak_ptr<FilmViewer> _viewer;
        wxSizer* _sizer;
-       wxStaticText* _cpl_name;
-       wxStaticText* _size;
-       wxStaticText* _length;
+       wxStaticText** _dcp;
        wxStaticText* _dropped;
+       wxStaticText* _decode_resolution;
        boost::scoped_ptr<wxTimer> _timer;
 };