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

diff --git a/src/wx/properties_dialog.cc b/src/wx/properties_dialog.cc
index 0ffbd06cb..f4acb6b1a 100644
--- a/src/wx/properties_dialog.cc
+++ b/src/wx/properties_dialog.cc
@@ -38,35 +38,29 @@ PropertiesDialog::PropertiesDialog (wxWindow* parent, shared_ptr<Film> film)
 {
 	wxFlexGridSizer* table = new wxFlexGridSizer (2, 3, 6);
 
-	add_label_to_sizer (table, this, "Frames");
-	_frames = new wxStaticText (this, wxID_ANY, std_to_wx (""));
+	add_label_to_sizer (table, this, _("Frames"));
+	_frames = new wxStaticText (this, wxID_ANY, wxT (""));
 	table->Add (_frames, 1, wxALIGN_CENTER_VERTICAL);
 
-	add_label_to_sizer (table, this, "Disk space required for frames");
-	_disk_for_frames = new wxStaticText (this, wxID_ANY, std_to_wx (""));
-	table->Add (_disk_for_frames, 1, wxALIGN_CENTER_VERTICAL);
-	
-	add_label_to_sizer (table, this, "Total disk space required");
-	_total_disk = new wxStaticText (this, wxID_ANY, std_to_wx (""));
-	table->Add (_total_disk, 1, wxALIGN_CENTER_VERTICAL);
+	add_label_to_sizer (table, this, _("Disk space required"));
+	_disk = new wxStaticText (this, wxID_ANY, wxT (""));
+	table->Add (_disk, 1, wxALIGN_CENTER_VERTICAL);
 
-	add_label_to_sizer (table, this, "Frames already encoded");
-	_encoded = new ThreadedStaticText (this, "counting...", boost::bind (&PropertiesDialog::frames_already_encoded, this));
+	add_label_to_sizer (table, this, _("Frames already encoded"));
+	_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())));
-		double const disk = ((double) Config::instance()->j2k_bandwidth() / 8) * _film->length().get() / (_film->frames_per_second () * 1073741824);
+		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_for_frames->SetLabel (std_to_wx (s.str ()));
-		stringstream t;
-		t << fixed << setprecision (1) << (disk * 2) << "Gb";
-		_total_disk->SetLabel (std_to_wx (t.str ()));
+		s << fixed << setprecision (1) << disk << _("Gb");
+		_disk->SetLabel (std_to_wx (s.str ()));
 	} else {
 		_frames->SetLabel (_("unknown"));
-		_disk_for_frames->SetLabel (_("unknown"));
-		_total_disk->SetLabel (_("unknown"));
+		_disk->SetLabel (_("unknown"));
 	}
 
 	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
@@ -91,8 +85,9 @@ PropertiesDialog::frames_already_encoded () const
 		return "";
 	}
 	
-	if (_film->dcp_length()) {
-		u << " (" << (_film->encoded_frames() * 100 / _film->dcp_length().get()) << "%)";
+	if (_film->length()) {
+		/* XXX: encoded_frames() should check which frames have been encoded */
+		u << " (" << (_film->encoded_frames() * 100 / _film->length().get()) << "%)";
 	}
 	return u.str ();
 }