Make KDM output options checkboxes rather than radios (part of #848).

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

diff --git a/src/lib/cinema_kdms.cc b/src/lib/cinema_kdms.cc
index 78e7c5ace6f2c3f12daeda4a50f6c319d88a1583..6a0349b3125cb97052bc6d8fc0607052a3218c5d 100644 (file)
--- a/src/lib/cinema_kdms.cc
+++ b/src/lib/cinema_kdms.cc
@@ -27,7 +27,6 @@
 #include "emailer.h"
 #include "compose.hpp"
 #include "log.h"
-#include "kdm_filename_format.h"
 #include <zip.h>
 #include <boost/foreach.hpp>
 
@@ -40,7 +39,7 @@ using std::runtime_error;
 using boost::shared_ptr;
 
 void
-CinemaKDMs::make_zip_file (boost::filesystem::path zip_file, KDMFilenameFormat name_format, dcp::NameFormat::Map name_values) const
+CinemaKDMs::make_zip_file (boost::filesystem::path zip_file, dcp::NameFormat name_format, dcp::NameFormat::Map name_values) const
 {
        int error;
        struct zip* zip = zip_open (zip_file.string().c_str(), ZIP_CREATE | ZIP_EXCL, &error);
@@ -65,7 +64,7 @@ CinemaKDMs::make_zip_file (boost::filesystem::path zip_file, KDMFilenameFormat n
                }
 
                name_values['s'] = i.screen->name;
-               string const name = name_format.get(name_values) + ".xml";
+               string const name = name_format.get(name_values, ".xml");
                if (zip_add (zip, name.c_str(), source) == -1) {
                        throw runtime_error ("failed to add KDM to ZIP archive");
                }
@@ -119,7 +118,7 @@ void
 CinemaKDMs::write_zip_files (
        list<CinemaKDMs> cinema_kdms,
        boost::filesystem::path directory,
-       KDMFilenameFormat name_format,
+       dcp::NameFormat name_format,
        dcp::NameFormat::Map name_values
        )
 {
@@ -129,7 +128,7 @@ CinemaKDMs::write_zip_files (
        BOOST_FOREACH (CinemaKDMs const & i, cinema_kdms) {
                boost::filesystem::path path = directory;
                name_values['c'] = i.cinema->name;
-               path /= name_format.get(name_values) + ".zip";
+               path /= name_format.get(name_values, ".zip");
                i.make_zip_file (path, name_format, name_values);
        }
 }
@@ -140,7 +139,7 @@ CinemaKDMs::write_zip_files (
 void
 CinemaKDMs::email (
        list<CinemaKDMs> cinema_kdms,
-       KDMFilenameFormat name_format,
+       dcp::NameFormat name_format,
        dcp::NameFormat::Map name_values,
        string cpl_name,
        shared_ptr<Log> log
@@ -175,11 +174,11 @@ CinemaKDMs::email (
                boost::algorithm::replace_all (body, "$END_TIME", name_values['t']);
                boost::algorithm::replace_all (body, "$CINEMA_NAME", i.cinema->name);
 
-               locked_stringstream screens;
+               string screens;
                BOOST_FOREACH (ScreenKDM const & j, i.screen_kdms) {
-                       screens << j.screen->name << ", ";
+                       screens += j.screen->name + ", ";
                }
-               boost::algorithm::replace_all (body, "$SCREENS", screens.str().substr (0, screens.str().length() - 2));
+               boost::algorithm::replace_all (body, "$SCREENS", screens.substr (0, screens.length() - 2));
 
                Emailer email (config->kdm_from(), i.cinema->emails, subject, body);
 
@@ -190,7 +189,7 @@ CinemaKDMs::email (
                        email.add_bcc (config->kdm_bcc ());
                }
 
-               email.add_attachment (zip_file, name_format.get(name_values) + ".zip", "application/zip");
+               email.add_attachment (zip_file, name_format.get(name_values, ".zip"), "application/zip");
 
                Config* c = Config::instance ();