projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge writer-thread with original which was time-cleanup.
[dcpomatic.git]
/
src
/
wx
/
properties_dialog.cc
diff --git
a/src/wx/properties_dialog.cc
b/src/wx/properties_dialog.cc
index 61e1f34f0ab1d8513d18a464dae7cd4fb835e5ef..0cf75cf5175bad2d56ca668f46c7d5f41cf54b5c 100644
(file)
--- a/
src/wx/properties_dialog.cc
+++ b/
src/wx/properties_dialog.cc
@@
-56,7
+56,7
@@
PropertiesDialog::PropertiesDialog (wxWindow* parent, shared_ptr<Film> film)
if (_film->length()) {
_frames->SetLabel (std_to_wx (lexical_cast<string> (_film->length().get())));
if (_film->length()) {
_frames->SetLabel (std_to_wx (lexical_cast<string> (_film->length().get())));
- double const disk = ((double)
Config::instance()
->j2k_bandwidth() / 8) * _film->length().get() / (_film->frames_per_second () * 1073741824);
+ double const disk = ((double)
_film
->j2k_bandwidth() / 8) * _film->length().get() / (_film->frames_per_second () * 1073741824);
stringstream s;
s << fixed << setprecision (1) << disk << "Gb";
_disk_for_frames->SetLabel (std_to_wx (s.str ()));
stringstream s;
s << fixed << setprecision (1) << disk << "Gb";
_disk_for_frames->SetLabel (std_to_wx (s.str ()));
@@
-91,9
+91,9
@@
PropertiesDialog::frames_already_encoded () const
return "";
}
return "";
}
- if (_film->
dcp_
length()) {
+ if (_film->length()) {
/* XXX: encoded_frames() should check which frames have been encoded */
/* XXX: encoded_frames() should check which frames have been encoded */
- u << " (" << (
(_film->encoded_frames() - _film->dcp_trim_start()) * 100 / _film->dcp_
length().get()) << "%)";
+ u << " (" << (
_film->encoded_frames() * 100 / _film->
length().get()) << "%)";
}
return u.str ();
}
}
return u.str ();
}