diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-05-05 15:24:36 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-05-06 20:15:49 +0200 |
| commit | 0a1d944d74308ccb940194bcb627652c72128650 (patch) | |
| tree | a12a924cd7c64e09cfcee56d6e8a2e447199214d /src/lib | |
| parent | 5579acd7ff7e1460f0b5bb54a4deedbd356153cd (diff) | |
Set 'i' earlier in name_values.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/kdm_with_metadata.cc | 2 | ||||
| -rw-r--r-- | src/lib/kdm_with_metadata.h | 9 |
2 files changed, 0 insertions, 11 deletions
diff --git a/src/lib/kdm_with_metadata.cc b/src/lib/kdm_with_metadata.cc index 62d544e0b..bf24f709d 100644 --- a/src/lib/kdm_with_metadata.cc +++ b/src/lib/kdm_with_metadata.cc @@ -66,7 +66,6 @@ write_files ( /* Write KDMs to the specified directory */ BOOST_FOREACH (KDMWithMetadataPtr i, kdms) { - name_values['i'] = i->kdm_id (); boost::filesystem::path out = directory / careful_string_filter(name_format.get(name_values, ".xml")); if (!boost::filesystem::exists (out) || confirm_overwrite (out)) { i->kdm_as_xml (out); @@ -96,7 +95,6 @@ make_zip_file (list<KDMWithMetadataPtr> kdms, boost::filesystem::path zip_file, Zipper zipper (zip_file); BOOST_FOREACH (KDMWithMetadataPtr i, kdms) { - name_values['i'] = i->kdm_id (); string const name = careful_string_filter(name_format.get(name_values, ".xml")); zipper.add (name, i->kdm_as_xml()); } diff --git a/src/lib/kdm_with_metadata.h b/src/lib/kdm_with_metadata.h index c2a13fced..e7b3c23ba 100644 --- a/src/lib/kdm_with_metadata.h +++ b/src/lib/kdm_with_metadata.h @@ -42,7 +42,6 @@ public: virtual std::string kdm_as_xml () const = 0; virtual void kdm_as_xml (boost::filesystem::path out) const = 0; - virtual std::string kdm_id () const = 0; dcp::NameFormat::Map const& name_values () const { return _name_values; @@ -121,10 +120,6 @@ public: return kdm.as_xml (out); } - std::string kdm_id () const { - return kdm.cpl_id (); - } - dcp::EncryptedKDM kdm; }; @@ -145,10 +140,6 @@ public: return kdm.as_xml (out); } - std::string kdm_id () const { - return kdm.id (); - } - EncryptedECinemaKDM kdm; }; #endif |