Simplify NameFormat stuff.

[dcpomatic.git] / src / lib / screen_kdm.cc

diff --git a/src/lib/screen_kdm.cc b/src/lib/screen_kdm.cc
index 22081fc81d399e8987214028a9dda0ccdc8dcaf2..129e64aeee5b7e88de8bcccd512cdfa8b98c796d 100644 (file)
--- 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,12 +35,12 @@ 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;
+               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);
        }