Remove Screen pointer from KDMWithMetadata, preferring to

[dcpomatic.git] / src / tools / dcpomatic_kdm_cli.cc

diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc
index a1003eceb27b4bcb885af7a4e785d3fa09e5f677..dd7fc82e3e92cada7037e52be7e264d8fe59c004 100644 (file)
--- 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(),