1 files changed, 10 insertions, 39 deletions

diff --git a/src/lib/dkdm_recipient.cc b/src/lib/dkdm_recipient.cc
index c73379bed..83ba96de6 100644
--- a/src/lib/dkdm_recipient.cc
+++ b/src/lib/dkdm_recipient.cc
@@ -19,12 +19,12 @@
 */
 
 
+#include "cinema_list.h"
 #include "config.h"
 #include "dkdm_recipient.h"
 #include "film.h"
 #include "kdm_with_metadata.h"
 #include <dcp/raw_convert.h>
-#include <dcp/utc_offset.h>
 
 
 using std::make_shared;
@@ -34,62 +34,33 @@ using std::vector;
 using dcp::raw_convert;
 
 
-DKDMRecipient::DKDMRecipient (cxml::ConstNodePtr node)
-	: KDMRecipient (node)
-{
-	for (auto i: node->node_children("Email")) {
-		emails.push_back (i->content());
-	}
-
-	utc_offset_hour = node->number_child<int>("UTCOffsetHour");
-	utc_offset_minute = node->number_child<int>("UTCOffsetMinute");
-}
-
-
-void
-DKDMRecipient::as_xml (xmlpp::Element* node) const
-{
-	KDMRecipient::as_xml (node);
-
-	for (auto i: emails) {
-		node->add_child("Email")->add_child_text(i);
-	}
-
-	node->add_child("UTCOffsetHour")->add_child_text(raw_convert<string>(utc_offset_hour));
-	node->add_child("UTCOffsetMinute")->add_child_text(raw_convert<string>(utc_offset_minute));
-}
-
-
 KDMWithMetadataPtr
 kdm_for_dkdm_recipient (
 	shared_ptr<const Film> film,
 	boost::filesystem::path cpl,
-	shared_ptr<DKDMRecipient> recipient,
-	boost::posix_time::ptime valid_from,
-	boost::posix_time::ptime valid_to
+	DKDMRecipient const& recipient,
+	dcp::LocalTime valid_from,
+	dcp::LocalTime valid_to
 	)
 {
-	if (!recipient->recipient) {
+	if (!recipient.recipient) {
 		return {};
 	}
 
-	dcp::LocalTime const begin(valid_from, dcp::UTCOffset(recipient->utc_offset_hour, recipient->utc_offset_minute));
-	dcp::LocalTime const end  (valid_to,   dcp::UTCOffset(recipient->utc_offset_hour, recipient->utc_offset_minute));
-
 	auto signer = Config::instance()->signer_chain();
 	if (!signer->valid()) {
 		throw InvalidSignerError();
 	}
 
-	auto const decrypted_kdm = film->make_kdm(cpl, begin, end);
-	auto const kdm = decrypted_kdm.encrypt(signer, recipient->recipient.get(), {}, dcp::Formulation::MODIFIED_TRANSITIONAL_1, true, 0);
+	auto const decrypted_kdm = film->make_kdm(cpl, valid_from, valid_to);
+	auto const kdm = decrypted_kdm.encrypt(signer, recipient.recipient.get(), {}, dcp::Formulation::MODIFIED_TRANSITIONAL_1, true, 0);
 
 	dcp::NameFormat::Map name_values;
 	name_values['f'] = kdm.content_title_text();
-	name_values['b'] = begin.date() + " " + begin.time_of_day(true, false);
-	name_values['e'] = end.date() + " " + end.time_of_day(true, false);
+	name_values['b'] = valid_from.date() + " " + valid_from.time_of_day(true, false);
+	name_values['e'] = valid_to.date() + " " + valid_to.time_of_day(true, false);
 	name_values['i'] = kdm.cpl_id();
 
-	return make_shared<KDMWithMetadata>(name_values, nullptr, recipient->emails, kdm);
+	return make_shared<KDMWithMetadata>(name_values, CinemaID(0), recipient.emails, kdm);
 }