Merge branch 'master' into content-rework-take5

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

diff --git a/src/wx/properties_dialog.cc b/src/wx/properties_dialog.cc
index a447091c3874f6d8fec39e41a61287336a93899c..06e2458321eb46850e3cc7e5aa981f2f4f4c450d 100644 (file)
--- a/src/wx/properties_dialog.cc
+++ b/src/wx/properties_dialog.cc
@@ -19,43 +19,54 @@
 
 #include <iomanip>
 #include <boost/lexical_cast.hpp>
+#include <boost/bind.hpp>
 #include "lib/film.h"
 #include "lib/config.h"
 #include "properties_dialog.h"
 #include "wx_util.h"
 
-using namespace std;
-using namespace boost;
+using std::string;
+using std::stringstream;
+using std::fixed;
+using std::setprecision;
+using boost::shared_ptr;
+using boost::lexical_cast;
 
-PropertiesDialog::PropertiesDialog (wxWindow* parent, Film* film)
+PropertiesDialog::PropertiesDialog (wxWindow* parent, shared_ptr<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 (""));
+       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 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");
-       _total_disk = new wxStaticText (this, wxID_ANY, std_to_wx (""));
-       table->Add (_total_disk, 1, wxALIGN_CENTER_VERTICAL);
+       add_label_to_sizer (table, this, _("Disk space required"));
+       _disk = new wxStaticText (this, wxID_ANY, wxT (""));
+       table->Add (_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);
-       stringstream s;
-       s << fixed << setprecision (1) << disk << "Gb";
-       _disk_for_frames->SetLabel (std_to_wx (s.str ()));
+       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);
 
-       stringstream t;
-       t << fixed << setprecision (1) << (disk * 2) << "Gb";
-       _total_disk->SetLabel (std_to_wx (t.str ()));
+#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 
 
        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 +76,20 @@ 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 (boost::thread_interrupted &) {
+               return "";
+       }
+       
+//     if (_film->length()) {
+//             /* XXX: encoded_frames() should check which frames have been encoded */
+//             u << " (" << (_film->encoded_frames() * 100 / _film->length().get()) << "%)";
+//     }
+       return u.str ();
+}