Add a new "Add DKDM" dialogue (#1637).

The basic motivation here is to avoid having to tell people to
"just" create a cinema with a screen in it just to be able to make
a DKDM.  Here you can just have a recipient, with emails etc.
and make DKDMs for them.  I hope this makes things clearer from the
user POV even if it does muddy the waters a bit with respect to
DKDMs just being KDMs (really).

3 files changed, 96 insertions, 58 deletions

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index aea058d80..f69ab5a6a 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -33,6 +33,7 @@
 #include "wx/recreate_chain_dialog.h"
 #include "wx/about_dialog.h"
 #include "wx/kdm_dialog.h"
+#include "wx/dkdm_dialog.h"
 #include "wx/self_dkdm_dialog.h"
 #include "wx/servers_list_dialog.h"
 #include "wx/hints_dialog.h"
@@ -65,14 +66,13 @@
 #include "lib/job_manager.h"
 #include "lib/exceptions.h"
 #include "lib/cinema.h"
-#include "lib/screen_kdm.h"
+#include "lib/kdm_with_metadata.h"
 #include "lib/send_kdm_email_job.h"
 #include "lib/encode_server_finder.h"
 #include "lib/update_checker.h"
 #include "lib/cross.h"
 #include "lib/content_factory.h"
 #include "lib/compose.hpp"
-#include "lib/cinema_kdms.h"
 #include "lib/dcpomatic_socket.h"
 #include "lib/hints.h"
 #include "lib/dcp_content.h"
@@ -227,6 +227,7 @@ enum {
 	ID_jobs_make_dcp,
 	ID_jobs_make_dcp_batch,
 	ID_jobs_make_kdms,
+	ID_jobs_make_dkdms,
 	ID_jobs_make_self_dkdm,
 	ID_jobs_export,
 	ID_jobs_send_dcp_to_tms,
@@ -262,6 +263,7 @@ public:
 		, _servers_list_dialog (0)
 		, _config_dialog (0)
 		, _kdm_dialog (0)
+		, _dkdm_dialog (0)
 		, _templates_dialog (0)
 		, _file_menu (0)
 		, _history_items (0)
@@ -318,6 +320,7 @@ public:
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::content_scale_to_fit_height, this), ID_content_scale_to_fit_height);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_make_dcp, this),           ID_jobs_make_dcp);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_make_kdms, this),          ID_jobs_make_kdms);
+		Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_make_dkdms, this),         ID_jobs_make_dkdms);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_make_dcp_batch, this),     ID_jobs_make_dcp_batch);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_make_self_dkdm, this),     ID_jobs_make_self_dkdm);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_export, this),             ID_jobs_export);
@@ -797,6 +800,21 @@ private:
 		_kdm_dialog->Show ();
 	}
 
+	void jobs_make_dkdms ()
+	{
+		if (!_film) {
+			return;
+		}
+
+		if (_dkdm_dialog) {
+			_dkdm_dialog->Destroy ();
+			_dkdm_dialog = 0;
+		}
+
+		_dkdm_dialog = new DKDMDialog (this, _film);
+		_dkdm_dialog->Show ();
+	}
+
 	/** @return false if we succeeded, true if not */
 	bool send_to_other_tool (int port, function<void(boost::filesystem::path)> start, string message)
 	{
@@ -1314,6 +1332,7 @@ private:
 		add_item (jobs_menu, _("Make DCP in &batch converter\tCtrl-B"), ID_jobs_make_dcp_batch, NEEDS_FILM | NOT_DURING_DCP_CREATION);
 		jobs_menu->AppendSeparator ();
 		add_item (jobs_menu, _("Make &KDMs...\tCtrl-K"), ID_jobs_make_kdms, NEEDS_FILM);
+		add_item (jobs_menu, _("Make &DKDMs...\tCtrl-D"), ID_jobs_make_dkdms, NEEDS_FILM);
 		add_item (jobs_menu, _("Make DKDM for DCP-o-matic..."), ID_jobs_make_self_dkdm, NEEDS_FILM | NEEDS_ENCRYPTION);
 		jobs_menu->AppendSeparator ();
 		add_item (jobs_menu, _("Export...\tCtrl-E"), ID_jobs_export, NEEDS_FILM);
@@ -1485,6 +1504,7 @@ private:
 	ServersListDialog* _servers_list_dialog;
 	wxPreferencesEditor* _config_dialog;
 	KDMDialog* _kdm_dialog;
+	DKDMDialog* _dkdm_dialog;
 	TemplatesDialog* _templates_dialog;
 	wxMenu* _file_menu;
 	shared_ptr<Film> _film;
diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index ef6b783f4..117e756c7 100644
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -38,9 +38,8 @@
 #include "lib/util.h"
 #include "lib/screen.h"
 #include "lib/job_manager.h"
-#include "lib/screen_kdm.h"
+#include "lib/kdm_with_metadata.h"
 #include "lib/exceptions.h"
-#include "lib/cinema_kdms.h"
 #include "lib/send_kdm_email_job.h"
 #include "lib/compose.hpp"
 #include "lib/cinema.h"
@@ -303,7 +302,7 @@ private:
 				return;
 			}
 
-			list<shared_ptr<ScreenKDM> > screen_kdms;
+			list<KDMWithMetadataPtr> kdms;
 			string title;
 
 #ifdef DCPOMATIC_VARIANT_SWAROOP
@@ -318,18 +317,29 @@ private:
 						continue;
 					}
 
+					dcp::LocalTime begin(_timing->from(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute());
+					dcp::LocalTime end(_timing->until(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute());
+
 					DecryptedECinemaKDM kdm (
 						decrypted.id(),
 						decrypted.name(),
 						decrypted.key(),
-						dcp::LocalTime (_timing->from(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()),
-						dcp::LocalTime (_timing->until(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute())
+						begin,
+						end
 						);
 
+					dcp::NameFormat::Map name_values;
+					name_values['c'] = i->cinema->name;
+					name_values['s'] = i->name;
+					name_values['f'] = title;
+					name_values['b'] = begin.date() + " " + begin.time_of_day(true, false);
+					name_values['e'] = end.date() + " " + end.time_of_day(true, false);
+					name_values['i'] = kdm.id();
+
 					/* Encrypt */
-					screen_kdms.push_back (
-						shared_ptr<ScreenKDM>(
-							new ECinemaScreenKDM(i, kdm.encrypt(i->recipient.get()))
+					kdms.push_back (
+						KDMWithMetadataPtr(
+							new ECinemaKDMWithMetadata(name_values, i->cinema, kdm.encrypt(i->recipient.get()))
 							)
 						);
 				}
@@ -355,10 +365,13 @@ private:
 						continue;
 					}
 
+					dcp::LocalTime begin(_timing->from(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute());
+					dcp::LocalTime end(_timing->until(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute());
+
 					/* Make an empty KDM */
 					dcp::DecryptedKDM kdm (
-						dcp::LocalTime (_timing->from(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()),
-						dcp::LocalTime (_timing->until(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()),
+						begin,
+						end,
 						decrypted.annotation_text().get_value_or (""),
 						decrypted.content_title_text(),
 						dcp::LocalTime().as_string()
@@ -369,27 +382,34 @@ private:
 						kdm.add_key (j);
 					}
 
+					dcp::EncryptedKDM const encrypted = kdm.encrypt(
+							signer, i->recipient.get(), i->trusted_device_thumbprints(), _output->formulation(),
+							!_output->forensic_mark_video(), _output->forensic_mark_audio() ? boost::optional<int>() : 0
+							);
+
+					dcp::NameFormat::Map name_values;
+					name_values['c'] = i->cinema->name;
+					name_values['s'] = i->name;
+					name_values['f'] = title;
+					name_values['b'] = begin.date() + " " + begin.time_of_day(true, false);
+					name_values['e'] = end.date() + " " + end.time_of_day(true, false);
+					name_values['i'] = encrypted.cpl_id ();
+
 					/* Encrypt */
-					screen_kdms.push_back (
-						shared_ptr<ScreenKDM>(
-							new DCPScreenKDM(
-								i,
-								kdm.encrypt(
-									signer, i->recipient.get(), i->trusted_device_thumbprints(), _output->formulation(),
-									!_output->forensic_mark_video(), _output->forensic_mark_audio() ? boost::optional<int>() : 0
-									)
-								)
+					kdms.push_back (
+						KDMWithMetadataPtr(
+							new DCPKDMWithMetadata(name_values, i->cinema.get(), i->cinema->emails, encrypted)
 							)
 						);
 				}
 			}
 
-			if (screen_kdms.empty()) {
+			if (kdms.empty()) {
 				return;
 			}
 
 			pair<shared_ptr<Job>, int> result = _output->make (
-				screen_kdms, title, _timing, bind (&DOMFrame::confirm_overwrite, this, _1)
+				kdms, title, bind (&DOMFrame::confirm_overwrite, this, _1)
 				);
 
 			if (result.first) {
diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc
index 166b22285..adb14f49e 100644
--- a/src/tools/dcpomatic_kdm_cli.cc
+++ b/src/tools/dcpomatic_kdm_cli.cc
@@ -24,8 +24,7 @@
 
 #include "lib/film.h"
 #include "lib/cinema.h"
-#include "lib/screen_kdm.h"
-#include "lib/cinema_kdms.h"
+#include "lib/kdm_with_metadata.h"
 #include "lib/config.h"
 #include "lib/exceptions.h"
 #include "lib/emailer.h"
@@ -130,22 +129,20 @@ always_overwrite ()
 
 void
 write_files (
-	list<shared_ptr<ScreenKDM> > screen_kdms,
+	list<KDMWithMetadataPtr> kdms,
 	bool zip,
 	boost::filesystem::path output,
 	dcp::NameFormat container_name_format,
 	dcp::NameFormat filename_format,
-	dcp::NameFormat::Map values,
 	bool verbose
 	)
 {
 	if (zip) {
-		int const N = CinemaKDMs::write_zip_files (
-			CinemaKDMs::collect (screen_kdms),
+		int const N = write_zip_files (
+			collect (kdms),
 			output,
 			container_name_format,
 			filename_format,
-			values,
 			bind (&always_overwrite)
 			);
 
@@ -153,8 +150,8 @@ write_files (
 			cout << "Wrote " << N << " ZIP files to " << output << "\n";
 		}
 	} else {
-		int const N = ScreenKDM::write_files (
-			screen_kdms, output, filename_format, values,
+		int const N = write_files (
+			kdms, output, filename_format,
 			bind (&always_overwrite)
 			);
 
@@ -223,17 +220,15 @@ from_film (
 
 	boost::filesystem::path cpl = cpls.front().cpl_file;
 
-	dcp::NameFormat::Map values;
-	values['f'] = film->name();
-	values['b'] = dcp::LocalTime(valid_from).date() + " " + dcp::LocalTime(valid_from).time_of_day(true, false);
-	values['e'] = dcp::LocalTime(valid_to).date() + " " + dcp::LocalTime(valid_to).time_of_day(true, false);
-
 	try {
-		list<shared_ptr<ScreenKDM> > screen_kdms = film->make_kdms (
-			screens, cpl, valid_from, valid_to, formulation, disable_forensic_marking_picture, disable_forensic_marking_audio
-			);
-
-		write_files (screen_kdms, zip, output, container_name_format, filename_format, values, verbose);
+		list<KDMWithMetadataPtr> kdms;
+		BOOST_FOREACH (shared_ptr<Screen> i, screens) {
+			KDMWithMetadataPtr p = kdm_for_screen (film, cpl, i, valid_from, valid_to, formulation, disable_forensic_marking_picture, disable_forensic_marking_audio);
+			if (p) {
+				kdms.push_back (p);
+			}
+		}
+		write_files (kdms, zip, output, container_name_format, filename_format, verbose);
 	} catch (FileError& e) {
 		cerr << program_name << ": " << e.what() << " (" << e.file().string() << ")\n";
 		exit (EXIT_FAILURE);
@@ -325,36 +320,39 @@ from_dkdm (
 	)
 {
 	dcp::NameFormat::Map values;
-	values['f'] = dkdm.annotation_text().get_value_or("");
-	values['b'] = dcp::LocalTime(valid_from).date() + " " + dcp::LocalTime(valid_from).time_of_day(true, false);
-	values['e'] = dcp::LocalTime(valid_to).date() + " " + dcp::LocalTime(valid_to).time_of_day(true, false);
 
 	try {
-		list<shared_ptr<ScreenKDM> > screen_kdms;
+		list<KDMWithMetadataPtr> kdms;
 		BOOST_FOREACH (shared_ptr<Screen> i, screens) {
 			if (!i->recipient) {
 				continue;
 			}
 
-			screen_kdms.push_back (
-				shared_ptr<ScreenKDM>(
-					new DCPScreenKDM(
-						i,
-						kdm_from_dkdm(
+			dcp::LocalTime begin(valid_from, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute());
+			dcp::LocalTime end(valid_to, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute());
+
+			dcp::EncryptedKDM const kdm = kdm_from_dkdm(
 							dkdm,
 							i->recipient.get(),
 							i->trusted_device_thumbprints(),
-							dcp::LocalTime(valid_from, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()),
-							dcp::LocalTime(valid_to, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()),
+							begin,
+							end,
 							formulation,
 							disable_forensic_marking_picture,
 							disable_forensic_marking_audio
-							)
-						)
-					)
-				);
+							);
+
+			dcp::NameFormat::Map name_values;
+			name_values['c'] = i->cinema->name;
+			name_values['s'] = i->name;
+			name_values['f'] = dkdm.annotation_text().get_value_or("");
+			name_values['b'] = begin.date() + " " + begin.time_of_day(true, false);
+			name_values['e'] = end.date() + " " + end.time_of_day(true, false);
+			name_values['i'] = kdm.cpl_id();
+
+			kdms.push_back (KDMWithMetadataPtr(new DCPKDMWithMetadata(name_values, i->cinema.get(), i->cinema->emails, kdm)));
 		}
-		write_files (screen_kdms, zip, output, container_name_format, filename_format, values, verbose);
+		write_files (kdms, zip, output, container_name_format, filename_format, verbose);
 	} catch (FileError& e) {
 		cerr << program_name << ": " << e.what() << " (" << e.file().string() << ")\n";
 		exit (EXIT_FAILURE);