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_cli.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_cli.cc')
| -rw-r--r-- | src/tools/dcpomatic_kdm_cli.cc | 13 |
1 files changed, 11 insertions, 2 deletions
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(), |