From 4e62980064496060af5a8c6ecab26ddf218aa63a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 4 May 2020 23:30:23 +0200 Subject: Remove Screen pointer from KDMWithMetadata, preferring to add metadata to a dcp::NameFormat::Map earlier in the call stack. --- src/wx/kdm_dialog.cc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/wx/kdm_dialog.cc') diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc index b067ff04a..f041c16c5 100644 --- a/src/wx/kdm_dialog.cc +++ b/src/wx/kdm_dialog.cc @@ -175,7 +175,13 @@ KDMDialog::make_clicked () for_audio ); - screen_kdms.push_back (KDMWithMetadataPtr(new DCPKDMWithMetadata(i, kdm))); + dcp::NameFormat::Map name_values; + if (i->cinema) { + name_values['c'] = i->cinema->name; + } + name_values['s'] = i->name; + + screen_kdms.push_back (KDMWithMetadataPtr(new DCPKDMWithMetadata(name_values, i->cinema, kdm))); } } -- cgit v1.2.3