Merge master.

[dcpomatic.git] / src / wx / properties_dialog.cc

diff --git a/src/wx/properties_dialog.cc b/src/wx/properties_dialog.cc
index e93d06dbe2d76638ea600a084155827383c4fb51..f4acb6b1a8f2181d7d108c696d49d678cd17d9c3 100644 (file)
--- a/src/wx/properties_dialog.cc
+++ b/src/wx/properties_dialog.cc
@@ -52,7 +52,9 @@ PropertiesDialog::PropertiesDialog (wxWindow* parent, shared_ptr<Film> film)
 
        if (_film->length()) {
                _frames->SetLabel (std_to_wx (lexical_cast<string> (_film->length().get())));
-               double const disk = ((double) _film->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->SetLabel (std_to_wx (s.str ()));