X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fproperties_dialog.cc;h=b8d97cb59c795014ff2ecdd7d382b27365537b3c;hb=e5da5518951e91f7bfb80718c9cf546e3ece059c;hp=d525fe38b115d059bd2cc2f279952540dccb456b;hpb=23cf9a87b290c32bfef24c6674734bed608d13c6;p=dcpomatic.git diff --git a/src/wx/properties_dialog.cc b/src/wx/properties_dialog.cc index d525fe38b..b8d97cb59 100644 --- a/src/wx/properties_dialog.cc +++ b/src/wx/properties_dialog.cc @@ -50,8 +50,8 @@ PropertiesDialog::PropertiesDialog (wxWindow* parent, shared_ptr film) _encoded = new ThreadedStaticText (this, _("counting..."), boost::bind (&PropertiesDialog::frames_already_encoded, this)); table->Add (_encoded, 1, wxALIGN_CENTER_VERTICAL); - _frames->SetLabel (std_to_wx (lexical_cast (_film->time_to_video_frames (_film->length())))); - double const disk = ((double) _film->j2k_bandwidth() / 8) * _film->length() / (TIME_HZ * 1073741824.0f); + _frames->SetLabel (std_to_wx (lexical_cast (_film->time_to_video_frames (_film->length_with_loop())))); + double const disk = ((double) _film->j2k_bandwidth() / 8) * _film->length_with_loop() / (TIME_HZ * 1073741824.0f); stringstream s; s << fixed << setprecision (1) << disk << wx_to_std (_("Gb")); _disk->SetLabel (std_to_wx (s.str ())); @@ -78,9 +78,9 @@ PropertiesDialog::frames_already_encoded () const return ""; } - if (_film->length()) { + if (_film->length_with_loop()) { /* XXX: encoded_frames() should check which frames have been encoded */ - u << " (" << (_film->encoded_frames() * 100 / _film->time_to_video_frames (_film->length())) << "%)"; + u << " (" << (_film->encoded_frames() * 100 / _film->time_to_video_frames (_film->length_with_loop())) << "%)"; } return u.str (); }