X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fproperties_dialog.cc;h=f80d5d6939f75f9c4c21ed269f8fafea7ee3bd97;hb=5c306d46d8293e0f26fbc6bf8c48f7cdd2508e3a;hp=53ca237555af31672f2dd2517038dc829ce270bf;hpb=9a2b45caa81d8fb056802dfe3c25f214e808ffdf;p=dcpomatic.git

diff --git a/src/wx/properties_dialog.cc b/src/wx/properties_dialog.cc
index 53ca23755..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
@@ -42,11 +42,7 @@ 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->time_to_video_frames (_film->length()))));
+	_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;
 	SafeStringStream s;
 	s << fixed << setprecision (1) << disk << wx_to_std (_("Gb"));
@@ -54,20 +50,3 @@ PropertiesDialog::PropertiesDialog (wxWindow* parent, shared_ptr<Film> film)
 
 	layout ();
 }
-
-string
-PropertiesDialog::frames_already_encoded () const
-{
-	SafeStringStream u;
-	try {
-		u << _film->encoded_frames ();
-	} catch (boost::thread_interrupted &) {
-		return "";
-	}
-	
-	if (_film->length()) {
-		/* XXX: encoded_frames() should check which frames have been encoded */
-		u << " (" << (_film->encoded_frames() * 100 / _film->time_to_video_frames (_film->length())) << "%)";
-	}
-	return u.str ();
-}