X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fplayer_information.cc;h=4e95e0956fb208de2e17b57553923beb2f1744ce;hb=d0188ed3e1ea5536e729e93b87d54114368120ac;hp=c2bf77259c021efb798cbeee58052ab3e0d351c6;hpb=cbd4450197a083bf58bda510e626f73ba583cb66;p=dcpomatic.git diff --git a/src/wx/player_information.cc b/src/wx/player_information.cc index c2bf77259..4e95e0956 100644 --- a/src/wx/player_information.cc +++ b/src/wx/player_information.cc @@ -18,6 +18,7 @@ */ + #include "player_information.h" #include "wx_util.h" #include "film_viewer.h" @@ -26,17 +27,22 @@ #include "lib/video_content.h" #include "lib/audio_content.h" #include "lib/dcp_content.h" +#include "lib/film.h" + using std::cout; +using std::dynamic_pointer_cast; +using std::shared_ptr; using std::string; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::weak_ptr; using boost::optional; + /* This should be even */ static int const dcp_lines = 6; -PlayerInformation::PlayerInformation (wxWindow* parent, FilmViewer* viewer) + +PlayerInformation::PlayerInformation(wxWindow* parent, FilmViewer const& viewer) : wxPanel (parent) , _viewer (viewer) , _sizer (new wxBoxSizer (wxHORIZONTAL)) @@ -49,7 +55,7 @@ PlayerInformation::PlayerInformation (wxWindow* parent, FilmViewer* viewer) DCPOMATIC_ASSERT ((dcp_lines % 2) == 0); { - wxSizer* s = new wxBoxSizer (wxVERTICAL); + auto s = new wxBoxSizer (wxVERTICAL); add_label_to_sizer(s, this, _("DCP"), false, 0)->SetFont(title_font); for (int i = 0; i < dcp_lines / 2; ++i) { _dcp[i] = add_label_to_sizer(s, this, wxT(""), false, 0); @@ -58,7 +64,7 @@ PlayerInformation::PlayerInformation (wxWindow* parent, FilmViewer* viewer) } { - wxSizer* s = new wxBoxSizer (wxVERTICAL); + auto s = new wxBoxSizer (wxVERTICAL); add_label_to_sizer(s, this, wxT(" "), false, 0); for (int i = dcp_lines / 2; i < dcp_lines; ++i) { _dcp[i] = add_label_to_sizer(s, this, wxT(""), false, 0); @@ -67,7 +73,21 @@ PlayerInformation::PlayerInformation (wxWindow* parent, FilmViewer* viewer) } { - wxSizer* s = new wxBoxSizer (wxVERTICAL); + _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)); + 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); _dropped = add_label_to_sizer(s, this, wxT(""), false, 0); _decode_resolution = add_label_to_sizer(s, this, wxT(""), false, 0); @@ -83,18 +103,26 @@ PlayerInformation::PlayerInformation (wxWindow* parent, FilmViewer* viewer) _timer->Start (500); } + void PlayerInformation::periodic_update () { - checked_set (_dropped, wxString::Format(_("Dropped frames: %d"), _viewer->dropped())); + auto s = wxString::Format(_("Dropped frames: %d"), _viewer.dropped() + _viewer.errored()); + if (_viewer.errored() == 1) { + s += wxString::Format(_(" (%d error)"), _viewer.errored()); + } else if (_viewer.errored() > 1) { + s += wxString::Format(_(" (%d errors)"), _viewer.errored()); + } + checked_set (_dropped, s); } + void PlayerInformation::triggered_update () { shared_ptr dcp; - if (_viewer->film()) { - ContentList content = _viewer->film()->content(); + if (_viewer.film()) { + auto content = _viewer.film()->content(); if (content.size() == 1) { dcp = dynamic_pointer_cast(content.front()); } @@ -106,11 +134,20 @@ PlayerInformation::triggered_update () checked_set (_dcp[r], wxT("")); } checked_set (_decode_resolution, wxT("")); + _kdm_panel->Hide(); return; } int r = 0; - checked_set (_dcp[r++], std_to_wx(dcp->name())); + checked_set(_dcp[r], std_to_wx(dcp->name())); + wxString tooltip; + for (auto directory: dcp->directories()) { + tooltip += std_to_wx(directory.string()) + "\n"; + } + if (!tooltip.empty()) { + _dcp[r]->SetToolTip(tooltip.substr(0, tooltip.length() - 1)); + } + ++r; if (dcp->needs_assets()) { checked_set (_dcp[r], _("Needs OV")); @@ -131,7 +168,7 @@ PlayerInformation::triggered_update () if (dcp->audio && !dcp->audio->streams().empty()) { checked_set (_dcp[r++], wxString::Format(_("Audio channels: %d"), dcp->audio->streams().front()->channels())); } - if (!dcp->caption.empty()) { + if (!dcp->text.empty()) { checked_set (_dcp[r++], _("Subtitles: yes")); } else { checked_set (_dcp[r++], _("Subtitles: no")); @@ -141,16 +178,16 @@ PlayerInformation::triggered_update () vfr = dcp->video_frame_rate (); DCPOMATIC_ASSERT (vfr); - string const len = String::compose( + auto const len = String::compose( wx_to_std(_("Length: %1 (%2 frames)")), - time_to_hmsf(dcp->full_length(), lrint(*vfr)), - dcp->full_length().frames_round(*vfr) + time_to_hmsf(dcp->full_length(_viewer.film()), lrint(*vfr)), + dcp->full_length(_viewer.film()).frames_round(*vfr) ); checked_set (_dcp[r++], std_to_wx(len)); - dcp::Size decode = dcp->video->size(); - optional reduction = _viewer->dcp_decode_reduction(); + auto decode = dcp->video->size(); + auto reduction = _viewer.dcp_decode_reduction(); if (reduction) { decode.width /= pow(2, *reduction); decode.height /= pow(2, *reduction); @@ -160,5 +197,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 (); }