X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fscreen_kdm.cc;h=f9a3fa36eb2720fa0d04d597486248ecdb68a338;hb=6b2c68525a3e8a6ea2152ba966f2ca1d861fed35;hp=a95a579485ac559e4e97289778b9114a66097687;hpb=e85799ff00274388b87a1492d7d7f401c0d7757d;p=dcpomatic.git

diff --git a/src/lib/screen_kdm.cc b/src/lib/screen_kdm.cc
index a95a57948..f9a3fa36e 100644
--- a/src/lib/screen_kdm.cc
+++ b/src/lib/screen_kdm.cc
@@ -25,18 +25,13 @@
 #include <boost/foreach.hpp>
 
 using std::string;
+using std::cout;
 using std::list;
 using boost::shared_ptr;
 
-bool
-operator== (ScreenKDM const & a, ScreenKDM const & b)
-{
-	return a.screen == b.screen && a.kdm == b.kdm;
-}
-
 int
 ScreenKDM::write_files (
-	list<ScreenKDM> screen_kdms,
+	list<shared_ptr<ScreenKDM> > screen_kdms,
 	boost::filesystem::path directory,
 	dcp::NameFormat name_format,
 	dcp::NameFormat::Map name_values,
@@ -45,17 +40,28 @@ ScreenKDM::write_files (
 {
 	int written = 0;
 
+	if (directory == "-") {
+		/* Write KDMs to the stdout */
+		BOOST_FOREACH (shared_ptr<ScreenKDM> 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['s'] = i.screen->name;
-		boost::filesystem::path out = directory / (name_format.get(name_values, ".xml"));
+	BOOST_FOREACH (shared_ptr<ScreenKDM> i, screen_kdms) {
+		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 / careful_string_filter(name_format.get(name_values, ".xml"));
 		if (!boost::filesystem::exists (out) || confirm_overwrite (out)) {
-			i.kdm.as_xml (out);
+			i->kdm_as_xml (out);
 			++written;
 		}
 	}