summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorMart Jansink <mart@gofilex.nl>2018-02-12 15:38:35 +0100
committerCarl Hetherington <cth@carlh.net>2018-02-14 23:28:26 +0000
commite46ae44d2c7271faf0ae14a1c5b97db6ec457354 (patch)
tree17a12c17f59246bcb379997174b15f0bb3d43bea /src/lib
parente85799ff00274388b87a1492d7d7f401c0d7757d (diff)
Make the KDM's id available to the filename format.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/cinema_kdms.cc1
-rw-r--r--src/lib/screen_kdm.cc1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/cinema_kdms.cc b/src/lib/cinema_kdms.cc
index 316deed2f..d4c1017bb 100644
--- a/src/lib/cinema_kdms.cc
+++ b/src/lib/cinema_kdms.cc
@@ -65,6 +65,7 @@ CinemaKDMs::make_zip_file (boost::filesystem::path zip_file, dcp::NameFormat nam
}
name_values['s'] = i.screen->name;
+ name_values['i'] = i.kdm.id ();
string const name = name_format.get(name_values, ".xml");
if (zip_add (zip, name.c_str(), source) == -1) {
throw runtime_error ("failed to add KDM to ZIP archive");
diff --git a/src/lib/screen_kdm.cc b/src/lib/screen_kdm.cc
index a95a57948..7e934b455 100644
--- a/src/lib/screen_kdm.cc
+++ b/src/lib/screen_kdm.cc
@@ -53,6 +53,7 @@ ScreenKDM::write_files (
BOOST_FOREACH (ScreenKDM const & i, screen_kdms) {
name_values['c'] = i.screen->cinema->name;
name_values['s'] = i.screen->name;
+ name_values['i'] = i.kdm.id ();
boost::filesystem::path out = directory / (name_format.get(name_values, ".xml"));
if (!boost::filesystem::exists (out) || confirm_overwrite (out)) {
i.kdm.as_xml (out);