X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fproperties_dialog.cc;h=1e0641ac4330d5ec576aa33c9135db7906977e10;hb=f49d66270bff2577d39474a0c1c18a7a1b1f14f6;hp=f4acb6b1a8f2181d7d108c696d49d678cd17d9c3;hpb=6a516da9a403ce05b2b78b3cf1376f4dfe4be3fe;p=dcpomatic.git

diff --git a/src/wx/properties_dialog.cc b/src/wx/properties_dialog.cc
index f4acb6b1a..1e0641ac4 100644
--- a/src/wx/properties_dialog.cc
+++ b/src/wx/properties_dialog.cc
@@ -1,3 +1,5 @@
+/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
+
 /*
     Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
 
@@ -50,18 +52,11 @@ PropertiesDialog::PropertiesDialog (wxWindow* parent, shared_ptr<Film> film)
 	_encoded = new ThreadedStaticText (this, _("counting..."), boost::bind (&PropertiesDialog::frames_already_encoded, this));
 	table->Add (_encoded, 1, wxALIGN_CENTER_VERTICAL);
 
-	if (_film->length()) {
-		_frames->SetLabel (std_to_wx (lexical_cast<string> (_film->length().get())));
-		FrameRateConversion frc (_film->source_frame_rate(), _film->dcp_frame_rate());
-		int const dcp_length = _film->length().get() * frc.factor();
-		double const disk = ((double) _film->j2k_bandwidth() / 8) * dcp_length / (_film->dcp_frame_rate() * 1073741824);
-		stringstream s;
-		s << fixed << setprecision (1) << disk << _("Gb");
-		_disk->SetLabel (std_to_wx (s.str ()));
-	} else {
-		_frames->SetLabel (_("unknown"));
-		_disk->SetLabel (_("unknown"));
-	}
+	_frames->SetLabel (std_to_wx (lexical_cast<string> (_film->time_to_video_frames (_film->length()))));
+	double const disk = ((double) _film->j2k_bandwidth() / 8) * _film->length() / (TIME_HZ * 1073741824.0f);
+	stringstream s;
+	s << fixed << setprecision (1) << disk << wx_to_std (_("Gb"));
+	_disk->SetLabel (std_to_wx (s.str ()));
 
 	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
 	overall_sizer->Add (table, 0, wxALL, 6);
@@ -87,7 +82,7 @@ PropertiesDialog::frames_already_encoded () const
 	
 	if (_film->length()) {
 		/* XXX: encoded_frames() should check which frames have been encoded */
-		u << " (" << (_film->encoded_frames() * 100 / _film->length().get()) << "%)";
+		u << " (" << (_film->encoded_frames() * 100 / _film->time_to_video_frames (_film->length())) << "%)";
 	}
 	return u.str ();
 }