Merge branch 'master' into content-rework-take5

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

diff --git a/src/wx/properties_dialog.cc b/src/wx/properties_dialog.cc
index 338d0f972c7e7a104a872f95a3add26942a0d83d..06e2458321eb46850e3cc7e5aa981f2f4f4c450d 100644 (file)
--- a/src/wx/properties_dialog.cc
+++ b/src/wx/properties_dialog.cc
@@ -42,32 +42,28 @@ PropertiesDialog::PropertiesDialog (wxWindow* parent, shared_ptr<Film> film)
        _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, wxT (""));
-       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, wxT (""));
-       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));
        table->Add (_encoded, 1, wxALIGN_CENTER_VERTICAL);
 
+#if 0  
        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.0f);
                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 << wx_to_std (_("Gb"));
+               _disk->SetLabel (std_to_wx (s.str ()));
        } else {
                _frames->SetLabel (_("unknown"));
-               _disk_for_frames->SetLabel (_("unknown"));
-               _total_disk->SetLabel (_("unknown"));
+               _disk->SetLabel (_("unknown"));
        }
+#endif 
 
        wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
        overall_sizer->Add (table, 0, wxALL, 6);
@@ -91,9 +87,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->length().get()) << "%)";
+//     }
        return u.str ();
 }