diff options
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dcpomatic_kdm.cc | 13 | ||||
| -rw-r--r-- | src/tools/dcpomatic_kdm_cli.cc | 13 |
2 files changed, 22 insertions, 4 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 diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc index a1003eceb..dd7fc82e3 100644 --- a/src/tools/dcpomatic_kdm_cli.cc +++ b/src/tools/dcpomatic_kdm_cli.cc @@ -244,7 +244,11 @@ from_film ( disable_forensic_marking_audio ); - kdms.push_back (KDMWithMetadataPtr(new DCPKDMWithMetadata(i, kdm))); + dcp::NameFormat::Map name_values; + name_values['c'] = i->cinema->name; + name_values['s'] = i->name; + + kdms.push_back (KDMWithMetadataPtr(new DCPKDMWithMetadata(name_values, i->cinema, kdm))); } } @@ -351,10 +355,15 @@ from_dkdm ( continue; } + dcp::NameFormat::Map name_values; + name_values['c'] = i->cinema->name; + name_values['s'] = i->name; + screen_kdms.push_back ( KDMWithMetadataPtr( new DCPKDMWithMetadata( - i, + name_values, + i->cinema, kdm_from_dkdm( dkdm, i->recipient.get(), |