Merge branch 'direct-mxf' of ssh://carlh.dnsalias.org/home/carl/git/dvdomatic into...

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

diff --git a/src/wx/properties_dialog.cc b/src/wx/properties_dialog.cc
index 61e1f34f0ab1d8513d18a464dae7cd4fb835e5ef..338d0f972c7e7a104a872f95a3add26942a0d83d 100644 (file)
--- a/src/wx/properties_dialog.cc
+++ b/src/wx/properties_dialog.cc
@@ -38,25 +38,25 @@ PropertiesDialog::PropertiesDialog (wxWindow* parent, shared_ptr<Film> film)
 {
        wxFlexGridSizer* table = new wxFlexGridSizer (2, 3, 6);
 
-       add_label_to_sizer (table, this, "Frames");
-       _frames = new wxStaticText (this, wxID_ANY, std_to_wx (""));
+       add_label_to_sizer (table, this, _("Frames"));
+       _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, std_to_wx (""));
+       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, std_to_wx (""));
+       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, "Frames already encoded");
-       _encoded = new ThreadedStaticText (this, "counting...", boost::bind (&PropertiesDialog::frames_already_encoded, this));
+       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 (_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 ()));
@@ -91,9 +91,9 @@ PropertiesDialog::frames_already_encoded () const
                return "";
        }
        
-       if (_film->dcp_length()) {
+       if (_film->length()) {
                /* 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 ();
 }