X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Fplayer_information.h;h=2ce49371431e3f6e8162aedd66105918e22a40d2;hb=13ebde8a7ab4423d4380ece07b93c180a7234b0b;hp=0dd6c4ad0e8f9c41f584b90ca43d729afc291dc2;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git diff --git a/src/wx/player_information.h b/src/wx/player_information.h index 0dd6c4ad0..2ce493714 100644 --- a/src/wx/player_information.h +++ b/src/wx/player_information.h @@ -18,18 +18,21 @@ */ -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS + +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include + class FilmViewer; + class PlayerInformation : public wxPanel { public: - PlayerInformation (wxWindow* parent, std::weak_ptr viewer); + PlayerInformation(wxWindow* parent, FilmViewer const& viewer); void triggered_update (); @@ -37,9 +40,12 @@ private: void periodic_update (); - std::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;