X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fproperties_dialog.cc;h=801996efa7bcb611111285a847c41848591f69b7;hp=122d647ca0883e8e888fb3d8e7e0ee14dd5cd25e;hb=854f2e5bbb7ffb9758b823af87034033033f3cb8;hpb=fb16d3932b49957672b5da3ced016186c926de9b

diff --git a/src/wx/properties_dialog.cc b/src/wx/properties_dialog.cc
index 122d647ca..801996efa 100644
--- a/src/wx/properties_dialog.cc
+++ b/src/wx/properties_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -19,60 +19,55 @@
 
 #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)
-	: wxDialog (parent, wxID_ANY, _("Film Properties"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
+PropertiesDialog::PropertiesDialog (wxWindow* parent, shared_ptr<Film> film)
+	: TableDialog (parent, _("Film Properties"), 2, false)
+	, _film (film)
 {
-	wxFlexGridSizer* table = new wxFlexGridSizer (2, 3, 6);
+	add (_("Frames"), true);
+	_frames = add (new wxStaticText (this, wxID_ANY, wxT ("")));
 
-	add_label_to_sizer (table, this, "Frames");
-	_frames = new wxStaticText (this, wxID_ANY, std_to_wx (""));
-	table->Add (_frames, 1, wxALIGN_CENTER_VERTICAL);
+	add (_("Disk space required"), true);
+	_disk = add (new wxStaticText (this, wxID_ANY, wxT ("")));
 
-	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 required");
-	_total_disk = new wxStaticText (this, wxID_ANY, std_to_wx (""));
-	table->Add (_total_disk, 1, wxALIGN_CENTER_VERTICAL);
-
-	add_label_to_sizer (table, this, "Frames already encoded");
-	_encoded = new wxStaticText (this, wxID_ANY, std_to_wx (""));
-	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);
+	add (_("Frames already encoded"), true);
+	_encoded = add (new ThreadedStaticText (this, _("counting..."), boost::bind (&PropertiesDialog::frames_already_encoded, this)));
+	_encoded->Finished.connect (boost::bind (&PropertiesDialog::layout, this));
+	_frames->SetLabel (std_to_wx (lexical_cast<string> (_film->length().frames (_film->video_frame_rate ()))));
+	double const disk = double (_film->required_disk_space()) / 1073741824.0f;
 	stringstream s;
-	s << fixed << setprecision (1) << disk << "Gb";
-	_disk_for_frames->SetLabel (std_to_wx (s.str ()));
+	s << fixed << setprecision (1) << disk << wx_to_std (_("Gb"));
+	_disk->SetLabel (std_to_wx (s.str ()));
 
-	stringstream t;
-	t << fixed << setprecision (1) << (disk * 2) << "Gb";
-	_total_disk->SetLabel (std_to_wx (t.str ()));
+	layout ();
+}
 
+string
+PropertiesDialog::frames_already_encoded () const
+{
 	stringstream u;
-	u << film->encoded_frames();
-	if (film->length()) {
-		u << " (" << (film->encoded_frames() * 100 / film->length()) << "%)";
+	try {
+		u << _film->encoded_frames ();
+	} catch (boost::thread_interrupted &) {
+		return "";
 	}
-	_encoded->SetLabel (std_to_wx (u.str ()));
 
-	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
-	overall_sizer->Add (table, 0, wxALL, 8);
-	
-	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
-	if (buttons) {
-		overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
+	uint64_t const frames = _film->length().frames (_film->video_frame_rate ());
+	if (frames) {
+		/* XXX: encoded_frames() should check which frames have been encoded */
+		u << " (" << (_film->encoded_frames() * 100 / frames) << "%)";
 	}
-
-	SetSizer (overall_sizer);
-	overall_sizer->SetSizeHints (this);
+	return u.str ();
 }