*/
+
#include "player_information.h"
#include "wx_util.h"
#include "film_viewer.h"
#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, weak_ptr<FilmViewer> viewer)
: wxPanel (parent)
, _viewer (viewer)
, _sizer (new wxBoxSizer (wxHORIZONTAL))
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);
}
{
- 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);
}
{
- wxSizer* s = new wxBoxSizer (wxVERTICAL);
+ 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);
_timer->Start (500);
}
+
void
PlayerInformation::periodic_update ()
{
- checked_set (_dropped, wxString::Format(_("Dropped frames: %d"), _viewer->dropped()));
+ auto fv = _viewer.lock ();
+ if (fv) {
+ auto s = wxString::Format(_("Dropped frames: %d"), fv->dropped() + fv->errored());
+ if (fv->errored() == 1) {
+ s += wxString::Format(_(" (%d error)"), fv->errored());
+ } else if (fv->errored() > 1) {
+ s += wxString::Format(_(" (%d errors)"), fv->errored());
+ }
+ checked_set (_dropped, s);
+ }
}
+
void
PlayerInformation::triggered_update ()
{
+ auto fv = _viewer.lock ();
+ if (!fv) {
+ return;
+ }
+
shared_ptr<DCPContent> dcp;
- if (_viewer->film()) {
- ContentList content = _viewer->film()->content();
+ if (fv->film()) {
+ auto content = fv->film()->content();
if (content.size() == 1) {
dcp = dynamic_pointer_cast<DCPContent>(content.front());
}
if (dcp->audio && !dcp->audio->streams().empty()) {
checked_set (_dcp[r++], wxString::Format(_("Audio channels: %d"), dcp->audio->streams().front()->channels()));
}
- if (dcp->caption) {
+ if (!dcp->text.empty()) {
checked_set (_dcp[r++], _("Subtitles: yes"));
} else {
checked_set (_dcp[r++], _("Subtitles: no"));
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(fv->film()), lrint(*vfr)),
+ dcp->full_length(fv->film()).frames_round(*vfr)
);
checked_set (_dcp[r++], std_to_wx(len));
- dcp::Size decode = dcp->video->size();
- optional<int> reduction = _viewer->dcp_decode_reduction();
+ auto decode = dcp->video->size();
+ auto reduction = fv->dcp_decode_reduction();
if (reduction) {
decode.width /= pow(2, *reduction);
decode.height /= pow(2, *reduction);