X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcinema_kdms.cc;h=c05dd613857db93776e1d6a288e9d7d2fd343e8c;hp=a91fc1c1e09edd25745975cc7c2e50e81825cd35;hb=b1dc9c3a2f7e55c9afc5bf2d5b465371b048e14f;hpb=736b3a068ba5a402b541d32f270669e6e1a4e5c4

diff --git a/src/lib/cinema_kdms.cc b/src/lib/cinema_kdms.cc
index a91fc1c1e..c05dd6138 100644
--- 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_name_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, KDMNameFormat name_format, 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);
@@ -53,7 +52,7 @@ CinemaKDMs::make_zip_file (boost::filesystem::path zip_file, KDMNameFormat name_
 
 	list<shared_ptr<string> > kdm_strings;
 
-	name_values["cinema"] = cinema->name;
+	name_values['c'] = cinema->name;
 
 	BOOST_FOREACH (ScreenKDM const & i, screen_kdms) {
 		shared_ptr<string> kdm (new string (i.kdm.as_xml ()));
@@ -64,7 +63,7 @@ CinemaKDMs::make_zip_file (boost::filesystem::path zip_file, KDMNameFormat name_
 			throw runtime_error ("could not create ZIP source");
 		}
 
-		name_values["screen"] = i.screen->name;
+		name_values['s'] = i.screen->name;
 		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,16 +118,16 @@ void
 CinemaKDMs::write_zip_files (
 	list<CinemaKDMs> cinema_kdms,
 	boost::filesystem::path directory,
-	KDMNameFormat name_format,
-	NameFormat::Map name_values
+	dcp::NameFormat name_format,
+	dcp::NameFormat::Map name_values
 	)
 {
 	/* No specific screen */
-	name_values["screen"] = "";
+	name_values['s'] = "";
 
 	BOOST_FOREACH (CinemaKDMs const & i, cinema_kdms) {
 		boost::filesystem::path path = directory;
-		name_values["cinema"] = i.cinema->name;
+		name_values['c'] = i.cinema->name;
 		path /= name_format.get(name_values) + ".zip";
 		i.make_zip_file (path, name_format, name_values);
 	}
@@ -140,8 +139,8 @@ CinemaKDMs::write_zip_files (
 void
 CinemaKDMs::email (
 	list<CinemaKDMs> cinema_kdms,
-	KDMNameFormat name_format,
-	NameFormat::Map name_values,
+	dcp::NameFormat name_format,
+	dcp::NameFormat::Map name_values,
 	string cpl_name,
 	shared_ptr<Log> log
 	)
@@ -153,11 +152,11 @@ CinemaKDMs::email (
 	}
 
 	/* No specific screen */
-	name_values["screen"] = "";
+	name_values['s'] = "";
 
 	BOOST_FOREACH (CinemaKDMs const & i, cinema_kdms) {
 
-		name_values["cinema"] = i.cinema->name;
+		name_values['c'] = i.cinema->name;
 
 		boost::filesystem::path zip_file = boost::filesystem::temp_directory_path ();
 		zip_file /= boost::filesystem::unique_path().string() + ".zip";
@@ -165,21 +164,21 @@ CinemaKDMs::email (
 
 		string subject = config->kdm_subject();
 		boost::algorithm::replace_all (subject, "$CPL_NAME", cpl_name);
-		boost::algorithm::replace_all (subject, "$START_TIME", name_values["from"]);
-		boost::algorithm::replace_all (subject, "$END_TIME", name_values["to"]);
+		boost::algorithm::replace_all (subject, "$START_TIME", name_values['f']);
+		boost::algorithm::replace_all (subject, "$END_TIME", name_values['t']);
 		boost::algorithm::replace_all (subject, "$CINEMA_NAME", i.cinema->name);
 
 		string body = config->kdm_email().c_str();
 		boost::algorithm::replace_all (body, "$CPL_NAME", cpl_name);
-		boost::algorithm::replace_all (body, "$START_TIME", name_values["from"]);
-		boost::algorithm::replace_all (body, "$END_TIME", name_values["to"]);
+		boost::algorithm::replace_all (body, "$START_TIME", name_values['f']);
+		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);