X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fproperties_dialog.cc;h=d525fe38b115d059bd2cc2f279952540dccb456b;hb=2851a385540353b21c8a45247ab54091bd2d70c2;hp=06e2458321eb46850e3cc7e5aa981f2f4f4c450d;hpb=afc495f722f89fea0bcc579046d1a5d362e36f69;p=dcpomatic.git

diff --git a/src/wx/properties_dialog.cc b/src/wx/properties_dialog.cc
index 06e245832..d525fe38b 100644
--- a/src/wx/properties_dialog.cc
+++ b/src/wx/properties_dialog.cc
@@ -36,34 +36,25 @@ PropertiesDialog::PropertiesDialog (wxWindow* parent, shared_ptr<Film> film)
 	: wxDialog (parent, wxID_ANY, _("Film Properties"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
 	, _film (film)
 {
-	wxFlexGridSizer* table = new wxFlexGridSizer (2, 3, 6);
+	wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
 
-	add_label_to_sizer (table, this, _("Frames"));
+	add_label_to_sizer (table, this, _("Frames"), true);
 	_frames = new wxStaticText (this, wxID_ANY, wxT (""));
 	table->Add (_frames, 1, wxALIGN_CENTER_VERTICAL);
 
-	add_label_to_sizer (table, this, _("Disk space required"));
+	add_label_to_sizer (table, this, _("Disk space required"), true);
 	_disk = new wxStaticText (this, wxID_ANY, wxT (""));
 	table->Add (_disk, 1, wxALIGN_CENTER_VERTICAL);
 
-	add_label_to_sizer (table, this, _("Frames already encoded"));
+	add_label_to_sizer (table, this, _("Frames already encoded"), true);
 	_encoded = new ThreadedStaticText (this, _("counting..."), boost::bind (&PropertiesDialog::frames_already_encoded, this));
 	table->Add (_encoded, 1, wxALIGN_CENTER_VERTICAL);
 
-#if 0	
-	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.0f);
-		stringstream s;
-		s << fixed << setprecision (1) << disk << wx_to_std (_("Gb"));
-		_disk->SetLabel (std_to_wx (s.str ()));
-	} else {
-		_frames->SetLabel (_("unknown"));
-		_disk->SetLabel (_("unknown"));
-	}
-#endif	
+	_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,9 +78,9 @@ PropertiesDialog::frames_already_encoded () const
 		return "";
 	}
 	
-//	if (_film->length()) {
-//		/* XXX: encoded_frames() should check which frames have been encoded */
-//		u << " (" << (_film->encoded_frames() * 100 / _film->length().get()) << "%)";
-//	}
+	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 ();
 }