X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fscreen_kdm.cc;h=182d03bb071c7d8cd632303ab76357e15272ed5d;hb=58b5c57c9a4767c786a1428f243c60ff52c82c26;hp=5cdf1c77bd420464136301753dd20046554de715;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/lib/screen_kdm.cc b/src/lib/screen_kdm.cc
index 5cdf1c77b..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.
 
@@ -34,18 +34,14 @@ operator== (ScreenKDM const & a, ScreenKDM const & b)
 	return a.screen == b.screen && a.kdm == b.kdm;
 }
 
-string
-ScreenKDM::filename (string film_name) const
-{
-	return tidy_for_filename (film_name) + "_" + tidy_for_filename (screen->cinema->name) + "_" + tidy_for_filename (screen->name) + ".kdm.xml";
-}
-
 void
-ScreenKDM::write_files (string film_name, list<ScreenKDM> screen_kdms, boost::filesystem::path directory)
+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) {
-		boost::filesystem::path out = directory / i.filename(film_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);
 	}
 }