X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fplayer_information.cc;h=6bb138c055587e98047a95e5eba4c9b5eefbc73a;hp=dbb394c645d7309708cc49c7e5c0836cdc278e91;hb=e20996d81f0bb17ca922c065ef7480ab43de1b0e;hpb=a5c629cb9b638b67a0e4c2d26fe9ab2e124bf0eb

diff --git a/src/wx/player_information.cc b/src/wx/player_information.cc
index dbb394c64..6bb138c05 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, weak_ptr<FilmViewer> 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,7 @@ PlayerInformation::PlayerInformation (wxWindow* parent, FilmViewer* viewer)
 	}
 
 	{
-		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);
@@ -83,18 +89,34 @@ PlayerInformation::PlayerInformation (wxWindow* parent, FilmViewer* viewer)
 	_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());
 		}
@@ -141,16 +163,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(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);