Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

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

diff --git a/src/lib/screen_kdm.cc b/src/lib/screen_kdm.cc
index 7e934b4557b341011bb154494efd564fa2307660..df74cc7eff823b47b760a6594e9c5e3c15c4f002 100644 (file)
--- 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;
 
@@ -45,13 +46,23 @@ ScreenKDM::write_files (
 {
        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"));