diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-05-04 23:30:23 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-05-06 20:15:16 +0200 |
| commit | 4e62980064496060af5a8c6ecab26ddf218aa63a (patch) | |
| tree | f3cc59c341866280e7998e7599039054a880d6b0 /src/tools/dcpomatic_kdm.cc | |
| parent | ca56871d4860b8ead384c410fe374c2fa993f88f (diff) | |
Remove Screen pointer from KDMWithMetadata, preferring to
add metadata to a dcp::NameFormat::Map earlier in the
call stack.
Diffstat (limited to 'src/tools/dcpomatic_kdm.cc')
| -rw-r--r-- | src/tools/dcpomatic_kdm.cc | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc index efc09c818..bda944d83 100644 --- a/src/tools/dcpomatic_kdm.cc +++ b/src/tools/dcpomatic_kdm.cc @@ -326,10 +326,14 @@ private: dcp::LocalTime (_timing->until(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()) ); + dcp::NameFormat::Map name_values; + name_values['c'] = i->cinema->name; + name_values['s'] = i->name; + /* Encrypt */ screen_kdms.push_back ( KDMWithMetadataPtr( - new ECinemaKDMWithMetadata(i, kdm.encrypt(i->recipient.get())) + new ECinemaKDMWithMetadata(name_values, i->cinema, kdm.encrypt(i->recipient.get())) ) ); } @@ -369,11 +373,16 @@ private: kdm.add_key (j); } + dcp::NameFormat::Map name_values; + name_values['c'] = i->cinema->name; + name_values['s'] = i->name; + /* Encrypt */ screen_kdms.push_back ( KDMWithMetadataPtr( new DCPKDMWithMetadata( - i, + name_values, + i->cinema, kdm.encrypt( signer, i->recipient.get(), i->trusted_device_thumbprints(), _output->formulation(), !_output->forensic_mark_video(), _output->forensic_mark_audio() ? boost::optional<int>() : 0 |