X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fscreen_kdm.cc;h=df74cc7eff823b47b760a6594e9c5e3c15c4f002;hb=dc5a2865d004ba56f8cbbdb3a56668a3967d1aa2;hp=182d03bb071c7d8cd632303ab76357e15272ed5d;hpb=03c5a8155043613c01e0e151735a7fcf8ab84415;p=dcpomatic.git

diff --git a/src/lib/screen_kdm.cc b/src/lib/screen_kdm.cc
index 182d03bb0..df74cc7ef 100644
--- a/src/lib/screen_kdm.cc
+++ b/src/lib/screen_kdm.cc
@@ -25,6 +25,7 @@
 #include <boost/foreach.hpp>
 
 using std::string;
+using std::cout;
 using std::list;
 using boost::shared_ptr;
 
@@ -34,14 +35,42 @@ operator== (ScreenKDM const & a, ScreenKDM const & b)
 	return a.screen == b.screen && a.kdm == b.kdm;
 }
 
-void
-ScreenKDM::write_files (list<ScreenKDM> screen_kdms, boost::filesystem::path directory, dcp::NameFormat name_format, dcp::NameFormat::Map name_values)
+int
+ScreenKDM::write_files (
+	list<ScreenKDM> screen_kdms,
+	boost::filesystem::path directory,
+	dcp::NameFormat name_format,
+	dcp::NameFormat::Map name_values,
+	boost::function<bool (boost::filesystem::path)> confirm_overwrite
+	)
 {
+	int written = 0;
+
+	if (directory == "-") {
+		/* Write KDMs to the stdout */
+		BOOST_FOREACH (ScreenKDM const & i, screen_kdms) {
+			cout << i.kdm.as_xml ();
+			++written;
+		}
+
+		return written;
+	}
+
+	if (!boost::filesystem::exists (directory)) {
+		boost::filesystem::create_directories (directory);
+	}
+
 	/* Write KDMs to the specified directory */
 	BOOST_FOREACH (ScreenKDM const & i, screen_kdms) {
-		name_values['c'] = i.screen->cinema->name;
+		name_values['c'] = i.screen->cinema ? 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"));
-		i.kdm.as_xml (out);
+		if (!boost::filesystem::exists (out) || confirm_overwrite (out)) {
+			i.kdm.as_xml (out);
+			++written;
+		}
 	}
+
+	return written;
 }