X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fplayer_information.cc;h=f0eaa59bbea8e643ce7900f332fc3836e824061e;hb=31de5b1272d928557a7272977584f5dcc9876c75;hp=c66c6c1e937fc19c8a29f72184ab7c46eb016d59;hpb=54ef7357a87885ec329a25e758fb6b132816ec67;p=dcpomatic.git

diff --git a/src/wx/player_information.cc b/src/wx/player_information.cc
index c66c6c1e9..f0eaa59bb 100644
--- a/src/wx/player_information.cc
+++ b/src/wx/player_information.cc
@@ -20,7 +20,7 @@
 
 #include "player_information.h"
 #include "wx_util.h"
-#include "control_film_viewer.h"
+#include "film_viewer.h"
 #include "lib/playlist.h"
 #include "lib/compose.hpp"
 #include "lib/video_content.h"
@@ -30,14 +30,15 @@
 
 using std::cout;
 using std::string;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::weak_ptr;
+using std::dynamic_pointer_cast;
 using boost::optional;
 
 /* This should be even */
 static int const dcp_lines = 6;
 
-PlayerInformation::PlayerInformation (wxWindow* parent, ControlFilmViewer* viewer)
+PlayerInformation::PlayerInformation (wxWindow* parent, weak_ptr<FilmViewer> viewer)
 	: wxPanel (parent)
 	, _viewer (viewer)
 	, _sizer (new wxBoxSizer (wxHORIZONTAL))
@@ -87,15 +88,29 @@ PlayerInformation::PlayerInformation (wxWindow* parent, ControlFilmViewer* viewe
 void
 PlayerInformation::periodic_update ()
 {
-	checked_set (_dropped, wxString::Format(_("Dropped frames: %d"), _viewer->dropped()));
+	shared_ptr<FilmViewer> fv = _viewer.lock ();
+	if (fv) {
+		wxString 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 ()
 {
+	shared_ptr<FilmViewer> fv = _viewer.lock ();
+	if (!fv) {
+		return;
+	}
+
 	shared_ptr<DCPContent> dcp;
-	if (_viewer->film()) {
-		ContentList content = _viewer->film()->content();
+	if (fv->film()) {
+		ContentList content = fv->film()->content();
 		if (content.size() == 1) {
 			dcp = dynamic_pointer_cast<DCPContent>(content.front());
 		}
@@ -144,14 +159,14 @@ PlayerInformation::triggered_update ()
 
 	string 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();
+	optional<int> reduction = fv->dcp_decode_reduction();
 	if (reduction) {
 		decode.width /= pow(2, *reduction);
 		decode.height /= pow(2, *reduction);