X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fplayer_information.h;h=2ce49371431e3f6e8162aedd66105918e22a40d2;hb=0a8bc96b4211eebfffaeebe8a24909aa3159d082;hp=ae3e134295f3442694a1dceda5fcff9816f83d32;hpb=c622a06189181a3a6ad356094c9a3cf4e1f5a722;p=dcpomatic.git diff --git a/src/wx/player_information.h b/src/wx/player_information.h index ae3e13429..2ce493714 100644 --- a/src/wx/player_information.h +++ b/src/wx/player_information.h @@ -18,19 +18,21 @@ */ -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS + +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include -#include + class FilmViewer; + class PlayerInformation : public wxPanel { public: - PlayerInformation (wxWindow* parent, boost::weak_ptr viewer); + PlayerInformation(wxWindow* parent, FilmViewer const& viewer); void triggered_update (); @@ -38,9 +40,12 @@ private: void periodic_update (); - boost::weak_ptr _viewer; + FilmViewer const& _viewer; + wxPanel* _kdm_panel; wxSizer* _sizer; wxStaticText** _dcp; + wxStaticText* _kdm_from; + wxStaticText* _kdm_to; wxStaticText* _dropped; wxStaticText* _decode_resolution; boost::scoped_ptr _timer;