From 600e0c67c61b29427602918daebb38a4822f95cb Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 21 Jul 2022 21:09:30 +0200 Subject: [PATCH] Add basic KDM information to the player (#2225). --- src/wx/player_information.cc | 27 +++++++++++++++++++++++++++ src/wx/player_information.h | 3 +++ 2 files changed, 30 insertions(+) diff --git a/src/wx/player_information.cc b/src/wx/player_information.cc index 6bb138c05..ca3a05ea4 100644 --- a/src/wx/player_information.cc +++ b/src/wx/player_information.cc @@ -72,6 +72,21 @@ PlayerInformation::PlayerInformation (wxWindow* parent, weak_ptr vie _sizer->Add (s, 1, wxEXPAND | wxALL, 6); } + { + _kdm_panel = new wxPanel(this, wxID_ANY); + auto s = new wxBoxSizer(wxVERTICAL); + add_label_to_sizer(s, _kdm_panel, _("KDM"), false, 0)->SetFont(title_font); + auto g = new wxGridBagSizer(0, DCPOMATIC_SIZER_GAP); + add_label_to_sizer(g, _kdm_panel, _("Valid from"), true, wxGBPosition(0, 0)); + _kdm_from = add_label_to_sizer(g, _kdm_panel, wxT(""), false, wxGBPosition(0, 1)); + add_label_to_sizer(g, _kdm_panel, _("Valid to"), true, wxGBPosition(1, 0)); + _kdm_to = add_label_to_sizer(g, _kdm_panel, wxT(""), false, wxGBPosition(1, 1)); + auto pad = new wxBoxSizer(wxVERTICAL); + s->Add(g, 1, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_GAP); + _kdm_panel->SetSizer(s); + _sizer->Add(_kdm_panel, 1, wxEXPAND | wxALL, 6); + } + { auto s = new wxBoxSizer (wxVERTICAL); add_label_to_sizer(s, this, _("Performance"), false, 0)->SetFont(title_font); @@ -128,6 +143,7 @@ PlayerInformation::triggered_update () checked_set (_dcp[r], wxT("")); } checked_set (_decode_resolution, wxT("")); + _kdm_panel->Hide(); return; } @@ -182,5 +198,16 @@ PlayerInformation::triggered_update () DCPOMATIC_ASSERT(r <= dcp_lines); + if (dcp->encrypted() && dcp->kdm()) { + _kdm_panel->Show(); + auto const kdm = *dcp->kdm(); + auto const before = kdm.not_valid_before(); + checked_set(_kdm_from, wxString::Format(_("%s %s"), std_to_wx(before.date()), std_to_wx(before.time_of_day(true, false)))); + auto const after = kdm.not_valid_after(); + checked_set(_kdm_to, wxString::Format(_("%s %s"), std_to_wx(after.date()), std_to_wx(after.time_of_day(true, false)))); + } else { + _kdm_panel->Hide(); + } + _sizer->Layout (); } diff --git a/src/wx/player_information.h b/src/wx/player_information.h index 269a9e6c7..b311847cb 100644 --- a/src/wx/player_information.h +++ b/src/wx/player_information.h @@ -41,8 +41,11 @@ private: void periodic_update (); std::weak_ptr _viewer; + wxPanel* _kdm_panel; wxSizer* _sizer; wxStaticText** _dcp; + wxStaticText* _kdm_from; + wxStaticText* _kdm_to; wxStaticText* _dropped; wxStaticText* _decode_resolution; boost::scoped_ptr _timer; -- 2.30.2