X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fscreen_kdm.cc;h=182d03bb071c7d8cd632303ab76357e15272ed5d;hb=55861a0b4ad4270f80b8d1ae10230cf2ebb25735;hp=22081fc81d399e8987214028a9dda0ccdc8dcaf2;hpb=fe9d2a290682021cd12a00bf21fa4db3012e2049;p=dcpomatic.git

diff --git a/src/lib/screen_kdm.cc b/src/lib/screen_kdm.cc
index 22081fc81..182d03bb0 100644
--- a/src/lib/screen_kdm.cc
+++ b/src/lib/screen_kdm.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -35,13 +35,13 @@ operator== (ScreenKDM const & a, ScreenKDM const & b)
 }
 
 void
-ScreenKDM::write_files (list<ScreenKDM> screen_kdms, boost::filesystem::path directory, KDMNameFormat name_format, dcp::NameFormat::Map name_values)
+ScreenKDM::write_files (list<ScreenKDM> screen_kdms, boost::filesystem::path directory, dcp::NameFormat name_format, dcp::NameFormat::Map name_values)
 {
 	/* Write KDMs to the specified directory */
 	BOOST_FOREACH (ScreenKDM const & i, screen_kdms) {
-		name_values["cinema"] = i.screen->cinema->name;
-		name_values["screen"] = i.screen->name;
-		boost::filesystem::path out = directory / (name_format.get(name_values) + ".xml");
+		name_values['c'] = i.screen->cinema->name;
+		name_values['s'] = i.screen->name;
+		boost::filesystem::path out = directory / (name_format.get(name_values, ".xml"));
 		i.kdm.as_xml (out);
 	}
 }