X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Fproperties_dialog.cc;h=f80d5d6939f75f9c4c21ed269f8fafea7ee3bd97;hb=ff96cc9c9e33fbe9dea02ea2d397144f9c9ac8c9;hp=801996efa7bcb611111285a847c41848591f69b7;hpb=74fe68e5895654e27a7cf8097917c1e95fa89519;p=dcpomatic.git

diff --git a/src/wx/properties_dialog.cc b/src/wx/properties_dialog.cc
index 801996efa..f80d5d693 100644
--- a/src/wx/properties_dialog.cc
+++ b/src/wx/properties_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -22,11 +22,11 @@
 #include <boost/bind.hpp>
 #include "lib/film.h"
 #include "lib/config.h"
+#include "lib/safe_stringstream.h"
 #include "properties_dialog.h"
 #include "wx_util.h"
 
 using std::string;
-using std::stringstream;
 using std::fixed;
 using std::setprecision;
 using boost::shared_ptr;
@@ -42,32 +42,11 @@ PropertiesDialog::PropertiesDialog (wxWindow* parent, shared_ptr<Film> film)
 	add (_("Disk space required"), true);
 	_disk = add (new wxStaticText (this, wxID_ANY, wxT ("")));
 
-	add (_("Frames already encoded"), true);
-	_encoded = add (new ThreadedStaticText (this, _("counting..."), boost::bind (&PropertiesDialog::frames_already_encoded, this)));
-	_encoded->Finished.connect (boost::bind (&PropertiesDialog::layout, this));
 	_frames->SetLabel (std_to_wx (lexical_cast<string> (_film->length().frames (_film->video_frame_rate ()))));
 	double const disk = double (_film->required_disk_space()) / 1073741824.0f;
-	stringstream s;
+	SafeStringStream s;
 	s << fixed << setprecision (1) << disk << wx_to_std (_("Gb"));
 	_disk->SetLabel (std_to_wx (s.str ()));
 
 	layout ();
 }
-
-string
-PropertiesDialog::frames_already_encoded () const
-{
-	stringstream u;
-	try {
-		u << _film->encoded_frames ();
-	} catch (boost::thread_interrupted &) {
-		return "";
-	}
-
-	uint64_t const frames = _film->length().frames (_film->video_frame_rate ());
-	if (frames) {
-		/* XXX: encoded_frames() should check which frames have been encoded */
-		u << " (" << (_film->encoded_frames() * 100 / frames) << "%)";
-	}
-	return u.str ();
-}