X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdkdm_recipient.cc;h=30c3075691d4baa1a81130ade548227d63c84e35;hb=68798e3ed491d642bb52e3d70dbe9c204aeb614b;hp=22da53f3babb5b13c0be0d3e211e4b407a048509;hpb=a5d004b0773f633401528392fc28e66d70e13ac8;p=dcpomatic.git diff --git a/src/lib/dkdm_recipient.cc b/src/lib/dkdm_recipient.cc index 22da53f3b..30c307569 100644 --- a/src/lib/dkdm_recipient.cc +++ b/src/lib/dkdm_recipient.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2020 Carl Hetherington + Copyright (C) 2020-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,15 +18,17 @@ */ + #include "dkdm_recipient.h" #include "kdm_with_metadata.h" #include "film.h" #include +using std::make_shared; +using std::shared_ptr; using std::string; using std::vector; -using std::shared_ptr; using dcp::raw_convert; @@ -72,13 +74,13 @@ kdm_for_dkdm_recipient ( dcp::LocalTime const begin(valid_from, recipient->utc_offset_hour, recipient->utc_offset_minute); dcp::LocalTime const end (valid_to, recipient->utc_offset_hour, recipient->utc_offset_minute); - dcp::EncryptedKDM const kdm = film->make_kdm ( + auto const kdm = film->make_kdm ( recipient->recipient.get(), vector(), cpl, begin, end, - dcp::MODIFIED_TRANSITIONAL_1, + dcp::Formulation::MODIFIED_TRANSITIONAL_1, true, 0 ); @@ -89,6 +91,6 @@ kdm_for_dkdm_recipient ( name_values['e'] = end.date() + " " + end.time_of_day(true, false); name_values['i'] = kdm.cpl_id(); - return KDMWithMetadataPtr(new KDMWithMetadata(name_values, 0, recipient->emails, kdm)); + return make_shared(name_values, nullptr, recipient->emails, kdm); }