X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fkdm_dialog.cc;h=55b89a37128925841dafbcada17040c9faac4508;hb=7851658223286410d5afb1e32bc44b4012ec5f55;hp=5ed1169b13390a3ac8504f39609dd7ce428dcee1;hpb=7e4d7d9e4f146576a63c6ab1be9bca5a79b507d9;p=dcpomatic.git

diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc
index 5ed1169b1..55b89a371 100644
--- a/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -25,10 +25,11 @@
 #include "kdm_output_panel.h"
 #include "kdm_cpl_panel.h"
 #include "confirm_kdm_email_dialog.h"
+#include "static_text.h"
+#include "dcpomatic_button.h"
 #include "lib/film.h"
 #include "lib/screen.h"
 #include "lib/screen_kdm.h"
-#include "lib/send_kdm_email_job.h"
 #include "lib/job_manager.h"
 #include "lib/cinema_kdms.h"
 #include "lib/config.h"
@@ -47,6 +48,7 @@ using std::pair;
 using std::cout;
 using std::vector;
 using std::make_pair;
+using std::runtime_error;
 using boost::shared_ptr;
 using boost::bind;
 
@@ -67,7 +69,7 @@ KDMDialog::KDMDialog (wxWindow* parent, shared_ptr<const Film> film)
 	subheading_font.SetWeight (wxFONTWEIGHT_BOLD);
 
 	/* Sub-heading: Screens */
-	wxStaticText* h = new wxStaticText (this, wxID_ANY, _("Screens"));
+	wxStaticText* h = new StaticText (this, _("Screens"));
 	h->SetFont (subheading_font);
 	left->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxBOTTOM, DCPOMATIC_SIZER_Y_GAP);
 	_screens = new ScreensPanel (this);
@@ -75,27 +77,35 @@ KDMDialog::KDMDialog (wxWindow* parent, shared_ptr<const Film> film)
 
 	/* Sub-heading: Timing */
 	/// TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix
-	h = new wxStaticText (this, wxID_ANY, S_("KDM|Timing"));
+	h = new StaticText (this, S_("KDM|Timing"));
 	h->SetFont (subheading_font);
 	right->Add (h, 0, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_Y_GAP * 2);
 	_timing = new KDMTimingPanel (this);
 	right->Add (_timing);
 
 	/* Sub-heading: CPL */
-	h = new wxStaticText (this, wxID_ANY, _("CPL"));
+	h = new StaticText (this, _("CPL"));
 	h->SetFont (subheading_font);
 	right->Add (h, 0, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_Y_GAP * 2);
-	_cpl = new KDMCPLPanel (this, film->cpls ());
+
+	vector<CPLSummary> cpls;
+	BOOST_FOREACH (CPLSummary const & i, film->cpls()) {
+		if (i.encrypted) {
+			cpls.push_back (i);
+		}
+	}
+
+	_cpl = new KDMCPLPanel (this, cpls);
 	right->Add (_cpl, 0, wxEXPAND);
 
 	/* Sub-heading: Output */
-	h = new wxStaticText (this, wxID_ANY, _("Output"));
+	h = new StaticText (this, _("Output"));
 	h->SetFont (subheading_font);
 	right->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2);
 	_output = new KDMOutputPanel (this, film->interop ());
 	right->Add (_output, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP);
 
-	_make = new wxButton (this, wxID_ANY, _("Make KDMs"));
+	_make = new Button (this, _("Make KDMs"));
 	right->Add (_make, 0, wxTOP | wxBOTTOM, DCPOMATIC_SIZER_GAP);
 
 	/* Make an overall sizer to get a nice border */
@@ -139,65 +149,30 @@ KDMDialog::make_clicked ()
 	shared_ptr<const Film> film = _film.lock ();
 	DCPOMATIC_ASSERT (film);
 
-	_output->save_kdm_name_format ();
-
+	list<shared_ptr<ScreenKDM> > screen_kdms;
 	try {
-		list<ScreenKDM> screen_kdms = film->make_kdms (
-			_screens->screens(), _cpl->cpl(), _timing->from(), _timing->until(), _output->formulation()
+
+		screen_kdms = film->make_kdms (
+			_screens->screens(), _cpl->cpl(), _timing->from(), _timing->until(), _output->formulation(),
+			!_output->forensic_mark_video(), _output->forensic_mark_audio() ? boost::optional<int>() : 0
 			);
 
-		dcp::NameFormat::Map name_values;
-		name_values['f'] = film->name();
-		name_values['b'] = dcp::LocalTime(_timing->from()).date() + " " + dcp::LocalTime(_timing->from()).time_of_day();
-		name_values['e'] = dcp::LocalTime(_timing->until()).date() + " " + dcp::LocalTime(_timing->until()).time_of_day();
-
-		if (_output->write_to ()) {
-			ScreenKDM::write_files (
-				screen_kdms,
-				_output->directory(),
-				_output->name_format(),
-				name_values,
-				bind (&KDMDialog::confirm_overwrite, this, _1)
-				);
-		}
+	} catch (runtime_error& e) {
+		error_dialog (this, std_to_wx(e.what()));
+		return;
+	}
 
-		if (_output->email ()) {
-
-			list<CinemaKDMs> const cinema_kdms = CinemaKDMs::collect (screen_kdms);
-
-			bool ok = true;
-
-			if (Config::instance()->confirm_kdm_email ()) {
-				list<string> emails;
-				BOOST_FOREACH (CinemaKDMs i, cinema_kdms) {
-					BOOST_FOREACH (string j, i.cinema->emails) {
-						emails.push_back (j);
-					}
-				}
-
-				ConfirmKDMEmailDialog* d = new ConfirmKDMEmailDialog (this, emails);
-				if (d->ShowModal() == wxID_CANCEL) {
-					ok = false;
-				}
-			}
-
-			if (ok) {
-				JobManager::instance()->add (
-					shared_ptr<Job> (new SendKDMEmailJob (
-								 cinema_kdms,
-								 _output->name_format(),
-								 name_values,
-								 film->dcp_name(),
-								 film->log()
-								 ))
-					);
-			}
-		}
-	} catch (dcp::NotEncryptedError& e) {
-		error_dialog (this, _("CPL's content is not encrypted."));
-	} catch (exception& e) {
-		error_dialog (this, e.what ());
-	} catch (...) {
-		error_dialog (this, _("An unknown exception occurred."));
+	pair<shared_ptr<Job>, int> result = _output->make (screen_kdms, film->name(), _timing, bind (&KDMDialog::confirm_overwrite, this, _1));
+	if (result.first) {
+		JobManager::instance()->add (result.first);
+	}
+
+	if (result.second > 0) {
+		/* XXX: proper plural form support in wxWidgets? */
+		wxString s = result.second == 1 ? _("%d KDM written to %s") : _("%d KDMs written to %s");
+		message_dialog (
+			this,
+			wxString::Format (s, result.second, std_to_wx(_output->directory().string()).data())
+			);
 	}
 }