Merge master.

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

diff --git a/src/wx/properties_dialog.cc b/src/wx/properties_dialog.cc
index aa97623cd943ca3dbc29deba2a1e9b80452e4660..f3f841a43f84f210dee9e5f8961155abde4384ad 100644 (file)
--- a/src/wx/properties_dialog.cc
+++ b/src/wx/properties_dialog.cc
@@ -36,35 +36,29 @@ 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, DVDOMATIC_SIZER_X_GAP, DVDOMATIC_SIZER_Y_GAP);
+       _table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
 
-       add_label_to_sizer (table, this, _("Frames"), true);
+       add_label_to_sizer (_table, this, _("Frames"), true);
        _frames = new wxStaticText (this, wxID_ANY, wxT (""));
-       table->Add (_frames, 1, wxALIGN_CENTER_VERTICAL);
+       _table->Add (_frames, 1, wxALIGN_CENTER_VERTICAL);
 
-       add_label_to_sizer (table, this, _("Disk space required"), true);
+       add_label_to_sizer (_table, this, _("Disk space required"), true);
        _disk = new wxStaticText (this, wxID_ANY, wxT (""));
-       table->Add (_disk, 1, wxALIGN_CENTER_VERTICAL);
+       _table->Add (_disk, 1, wxALIGN_CENTER_VERTICAL);
 
-       add_label_to_sizer (table, this, _("Frames already encoded"), true);
+       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);
+       _encoded->Finished.connect (boost::bind (&PropertiesDialog::layout, 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.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"));
-       }
+       _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);
+       overall_sizer->Add (_table, 0, wxALL, DCPOMATIC_DIALOG_BORDER);
        
        wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
        if (buttons) {
@@ -75,6 +69,13 @@ PropertiesDialog::PropertiesDialog (wxWindow* parent, shared_ptr<Film> film)
        overall_sizer->SetSizeHints (this);
 }
 
+void
+PropertiesDialog::layout ()
+{
+       _table->Layout ();
+       Fit ();
+}
+
 string
 PropertiesDialog::frames_already_encoded () const
 {
@@ -87,7 +88,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 ();
 }