Remove unused variable.

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

diff --git a/src/wx/properties_dialog.cc b/src/wx/properties_dialog.cc
index a447091c3874f6d8fec39e41a61287336a93899c..67f1fc91bef2bd5e5b245ddd8464ee38e9c79155 100644 (file)
--- a/src/wx/properties_dialog.cc
+++ b/src/wx/properties_dialog.cc
@@ -19,6 +19,7 @@
 
 #include <iomanip>
 #include <boost/lexical_cast.hpp>
+#include <boost/bind.hpp>
 #include "lib/film.h"
 #include "lib/config.h"
 #include "properties_dialog.h"
@@ -29,23 +30,28 @@ using namespace boost;
 
 PropertiesDialog::PropertiesDialog (wxWindow* parent, Film* film)
        : wxDialog (parent, wxID_ANY, _("Film Properties"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
+       , _film (film)
 {
-       wxFlexGridSizer* table = new wxFlexGridSizer (2, 6, 6);
+       wxFlexGridSizer* table = new wxFlexGridSizer (2, 3, 6);
 
        add_label_to_sizer (table, this, "Frames");
        _frames = new wxStaticText (this, wxID_ANY, std_to_wx (""));
        table->Add (_frames, 1, wxALIGN_CENTER_VERTICAL);
 
-       add_label_to_sizer (table, this, "Disk space for frames");
+       add_label_to_sizer (table, this, "Disk space required for frames");
        _disk_for_frames = new wxStaticText (this, wxID_ANY, std_to_wx (""));
        table->Add (_disk_for_frames, 1, wxALIGN_CENTER_VERTICAL);
        
-       add_label_to_sizer (table, this, "Total disk space");
+       add_label_to_sizer (table, this, "Total disk space required");
        _total_disk = new wxStaticText (this, wxID_ANY, std_to_wx (""));
        table->Add (_total_disk, 1, wxALIGN_CENTER_VERTICAL);
 
-       _frames->SetLabel (std_to_wx (lexical_cast<string> (film->length ())));
-       double const disk = ((double) Config::instance()->j2k_bandwidth() / 8) * film->length() / (film->frames_per_second () * 1073741824);
+       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);
+       
+       _frames->SetLabel (std_to_wx (lexical_cast<string> (_film->length ())));
+       double const disk = ((double) Config::instance()->j2k_bandwidth() / 8) * _film->length() / (_film->frames_per_second () * 1073741824);
        stringstream s;
        s << fixed << setprecision (1) << disk << "Gb";
        _disk_for_frames->SetLabel (std_to_wx (s.str ()));
@@ -55,7 +61,7 @@ PropertiesDialog::PropertiesDialog (wxWindow* parent, Film* film)
        _total_disk->SetLabel (std_to_wx (t.str ()));
 
        wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
-       overall_sizer->Add (table);
+       overall_sizer->Add (table, 0, wxALL, 6);
        
        wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
        if (buttons) {
@@ -65,3 +71,19 @@ PropertiesDialog::PropertiesDialog (wxWindow* parent, Film* film)
        SetSizer (overall_sizer);
        overall_sizer->SetSizeHints (this);
 }
+
+string
+PropertiesDialog::frames_already_encoded () const
+{
+       stringstream u;
+       try {
+               u << _film->encoded_frames ();
+       } catch (thread_interrupted &) {
+               return "";
+       }
+       
+       if (_film->length()) {
+               u << " (" << (_film->encoded_frames() * 100 / _film->length()) << "%)";
+       }
+       return u.str ();
+}