Make the KDM's id available to the filename format.

diff --git a/src/lib/cinema_kdms.cc b/src/lib/cinema_kdms.cc
index 316deed2fa3401b0a2606a251176e267adbfa74e..d4c1017bb6bcb1846332be77ba7559ba0af6f8d5 100644 (file)
--- 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 a95a579485ac559e4e97289778b9114a66097687..7e934b4557b341011bb154494efd564fa2307660 100644 (file)
--- 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);