Basic re-enabling of the properties window (#138).

diff --git a/src/wx/properties_dialog.cc b/src/wx/properties_dialog.cc
index 06e2458321eb46850e3cc7e5aa981f2f4f4c450d..d20a58ca8b485aa49ed9dc4e3d92fe3ccc741925 100644 (file)
--- a/src/wx/properties_dialog.cc
+++ b/src/wx/properties_dialog.cc
@@ -50,20 +50,13 @@ PropertiesDialog::PropertiesDialog (wxWindow* parent, shared_ptr<Film> film)
        _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->video_length())));
+       FrameRateConversion frc (_film->video_frame_rate(), _film->dcp_frame_rate());
+       int const dcp_length = _film->video_length() * 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 ()));
 
        wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
        overall_sizer->Add (table, 0, wxALL, 6);
@@ -87,9 +80,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->video_length()) {
+               /* XXX: encoded_frames() should check which frames have been encoded */
+               u << " (" << (_film->encoded_frames() * 100 / _film->video_length()) << "%)";
+       }
        return u.str ();
 }