Merge master.

9 files changed, 98 insertions, 40 deletions

diff --git a/src/lib/config.cc b/src/lib/config.cc
index a0211386b..bb1fcd211 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -67,9 +67,6 @@ Config::Config ()
 	, _default_dcp_content_type (DCPContentType::from_isdcf_name ("TST"))
 	, _default_j2k_bandwidth (100000000)
 	, _default_audio_delay (0)
-	, _kdm_email (
-		_("Dear Projectionist\n\nPlease find attached KDMs for $CPL_NAME.\n\nThe KDMs are valid from $START_TIME until $END_TIME.\n\nBest regards,\nDCP-o-matic")
-		)
 	, _check_for_updates (false)
 	, _check_for_test_updates (false)
 	, _maximum_j2k_bandwidth (250000000)
@@ -85,6 +82,8 @@ Config::Config ()
 	_colour_conversions.push_back (PresetColourConversion (_("sRGB"), 2.4, true, dcp::colour_matrix::srgb_to_xyz, 2.6));
 	_colour_conversions.push_back (PresetColourConversion (_("sRGB non-linearised"), 2.4, false, dcp::colour_matrix::srgb_to_xyz, 2.6));
 	_colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), 2.2, false, dcp::colour_matrix::rec709_to_xyz, 2.6));
+
+	reset_kdm_email ();
 }
 
 void
@@ -188,6 +187,7 @@ Config::read ()
 	_mail_user = f.optional_string_child("MailUser").get_value_or ("");
 	_mail_password = f.optional_string_child("MailPassword").get_value_or ("");
 	_kdm_from = f.string_child ("KDMFrom");
+	_kdm_cc = f.optional_string_child ("KDMCC").get_value_or ("");
 	_kdm_email = f.string_child ("KDMEmail");
 
 	_check_for_updates = f.optional_bool_child("CheckForUpdates").get_value_or (false);
@@ -367,6 +367,7 @@ Config::write () const
 	root->add_child("MailUser")->add_child_text (_mail_user);
 	root->add_child("MailPassword")->add_child_text (_mail_password);
 	root->add_child("KDMFrom")->add_child_text (_kdm_from);
+	root->add_child("KDMCC")->add_child_text (_kdm_cc);
 	root->add_child("KDMEmail")->add_child_text (_kdm_email);
 
 	root->add_child("CheckForUpdates")->add_child_text (_check_for_updates ? "1" : "0");
@@ -408,3 +409,16 @@ Config::changed ()
 	write ();
 	Changed ();
 }
+
+void
+Config::reset_kdm_email ()
+{
+	_kdm_email = _(
+		"Dear Projectionist\n\n"
+		"Please find attached KDMs for $CPL_NAME.\n\n"
+		"Cinema: $CINEMA_NAME\n"
+		"Screen(s): $SCREENS\n\n"
+		"The KDMs are valid from $START_TIME until $END_TIME.\n\n"
+		"Best regards,\nDCP-o-matic"
+		);
+}
diff --git a/src/lib/config.h b/src/lib/config.h
index d82f52046..d9f104c7d 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -172,6 +172,10 @@ public:
 		return _kdm_from;
 	}
 
+	std::string kdm_cc () const {
+		return _kdm_cc;
+	}
+	
 	std::string kdm_email () const {
 		return _kdm_email;
 	}
@@ -323,11 +327,18 @@ public:
 		changed ();
 	}
 
+	void set_kdm_cc (std::string f) {
+		_kdm_cc = f;
+		changed ();
+	}
+	
 	void set_kdm_email (std::string e) {
 		_kdm_email = e;
 		changed ();
 	}
 
+	void reset_kdm_email ();
+
 	void set_check_for_updates (bool c) {
 		_check_for_updates = c;
 		changed ();
@@ -403,6 +414,7 @@ private:
 	std::string _mail_user;
 	std::string _mail_password;
 	std::string _kdm_from;
+	std::string _kdm_cc;
 	std::string _kdm_email;
 	/** true to check for updates on startup */
 	bool _check_for_updates;
diff --git a/src/lib/kdm.cc b/src/lib/kdm.cc
index c08750961..5754fd469 100644
--- a/src/lib/kdm.cc
+++ b/src/lib/kdm.cc
@@ -32,6 +32,7 @@
 using std::list;
 using std::string;
 using std::stringstream;
+using std::cout;
 using boost::shared_ptr;
 
 struct ScreenKDM
@@ -228,7 +229,9 @@ email_kdms (
 		quickmail_initialize ();
 		quickmail mail = quickmail_create (Config::instance()->kdm_from().c_str(), "KDM delivery");
 		quickmail_add_to (mail, i->cinema->email.c_str ());
-		
+		if (!Config::instance()->kdm_cc().empty ()) {
+			quickmail_add_cc (mail, Config::instance()->kdm_cc().c_str ());
+		}
 		string body = Config::instance()->kdm_email().c_str();
 		boost::algorithm::replace_all (body, "$CPL_NAME", film->dcp_name ());
 		stringstream start;
@@ -237,6 +240,12 @@ email_kdms (
 		stringstream end;
 		end << to.date() << " " << to.time_of_day();
 		boost::algorithm::replace_all (body, "$END_TIME", end.str ());
+		boost::algorithm::replace_all (body, "$CINEMA_NAME", i->cinema->name);
+		stringstream screens;
+		for (list<ScreenKDM>::const_iterator j = i->screen_kdms.begin(); j != i->screen_kdms.end(); ++j) {
+			screens << j->screen->name << ", ";
+		}
+		boost::algorithm::replace_all (body, "$SCREENS", screens.str().substr (0, screens.str().length() - 2));
 
 		quickmail_set_body (mail, body.c_str());
 		quickmail_add_attachment_file (mail, zip_file.string().c_str(), "application/zip");
diff --git a/src/lib/po/de_DE.po b/src/lib/po/de_DE.po
index f853d2ce2..9f6380c36 100644
--- a/src/lib/po/de_DE.po
+++ b/src/lib/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-21 14:51+0100\n"
+"POT-Creation-Date: 2014-06-23 00:25+0100\n"
 "PO-Revision-Date: 2014-06-21 03:55+0100\n"
 "Last-Translator: Carsten Kurz\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -241,12 +241,16 @@ msgstr ""
 msgid "De-interlacing"
 msgstr "De-Interlacer"
 
-#: src/lib/config.cc:71
+#: src/lib/config.cc:417
+#, fuzzy
 msgid ""
 "Dear Projectionist\n"
 "\n"
 "Please find attached KDMs for $CPL_NAME.\n"
 "\n"
+"Cinema: $CINEMA_NAME\n"
+"Screen(s): $SCREENS\n"
+"\n"
 "The KDMs are valid from $START_TIME until $END_TIME.\n"
 "\n"
 "Best regards,\n"
@@ -425,7 +429,7 @@ msgstr "Hinweis"
 msgid "Rating"
 msgstr "Freigabehinweis"
 
-#: src/lib/config.cc:87 src/lib/config.cc:174
+#: src/lib/config.cc:84 src/lib/config.cc:173
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
@@ -524,7 +528,7 @@ msgstr "Überleitung"
 msgid "Unexpected ZIP file contents"
 msgstr "Ungültiger ZIP Inhalt"
 
-#: src/lib/image_proxy.cc:172
+#: src/lib/image_proxy.cc:174
 msgid "Unexpected image type received by server"
 msgstr "Ungültiges Bildformat vom Server erhalten"
 
@@ -722,11 +726,11 @@ msgstr "Nur Bitmap Untertitel werden unterstützt"
 msgid "remaining"
 msgstr "verbleibend"
 
-#: src/lib/config.cc:85 src/lib/video_content.cc:175
+#: src/lib/config.cc:82 src/lib/video_content.cc:175
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/config.cc:86
+#: src/lib/config.cc:83
 msgid "sRGB non-linearised"
 msgstr "sRGB nicht linearisiert"
 
diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index 6f93bba55..d243f0b9a 100644
--- a/src/lib/po/es_ES.po
+++ b/src/lib/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LIBDCPOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-21 14:51+0100\n"
+"POT-Creation-Date: 2014-06-23 00:25+0100\n"
 "PO-Revision-Date: 2014-04-20 10:12-0500\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -237,12 +237,16 @@ msgstr "DCP-o-matic ya no ofrece el filtro `%1', así que ha sido desactivado."
 msgid "De-interlacing"
 msgstr "Desentrelazado"
 
-#: src/lib/config.cc:71
+#: src/lib/config.cc:417
+#, fuzzy
 msgid ""
 "Dear Projectionist\n"
 "\n"
 "Please find attached KDMs for $CPL_NAME.\n"
 "\n"
+"Cinema: $CINEMA_NAME\n"
+"Screen(s): $SCREENS\n"
+"\n"
 "The KDMs are valid from $START_TIME until $END_TIME.\n"
 "\n"
 "Best regards,\n"
@@ -419,7 +423,7 @@ msgstr "Anuncio de servicio público"
 msgid "Rating"
 msgstr "Clasificación"
 
-#: src/lib/config.cc:87 src/lib/config.cc:174
+#: src/lib/config.cc:84 src/lib/config.cc:173
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
@@ -518,7 +522,7 @@ msgstr "Transitional"
 msgid "Unexpected ZIP file contents"
 msgstr "Contenidos inesperados del fichero ZIP"
 
-#: src/lib/image_proxy.cc:172
+#: src/lib/image_proxy.cc:174
 msgid "Unexpected image type received by server"
 msgstr ""
 
@@ -716,11 +720,11 @@ msgstr "todavía no se soportan subtítulos que no son en mapas de bits"
 msgid "remaining"
 msgstr "pendiente"
 
-#: src/lib/config.cc:85 src/lib/video_content.cc:175
+#: src/lib/config.cc:82 src/lib/video_content.cc:175
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/config.cc:86
+#: src/lib/config.cc:83
 msgid "sRGB non-linearised"
 msgstr "sRGB no-lineal"
 
diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index e9e67bf4f..117565dce 100644
--- a/src/lib/po/fr_FR.po
+++ b/src/lib/po/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-21 14:51+0100\n"
+"POT-Creation-Date: 2014-06-23 00:25+0100\n"
 "PO-Revision-Date: 2014-06-20 15:53+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -240,12 +240,15 @@ msgstr "DCP-o-matic ne gère plus le filtre `%1'. Celui-ci a été désactivé."
 msgid "De-interlacing"
 msgstr "Désentrelacement"
 
-#: src/lib/config.cc:71
+#: src/lib/config.cc:417
 msgid ""
 "Dear Projectionist\n"
 "\n"
 "Please find attached KDMs for $CPL_NAME.\n"
 "\n"
+"Cinema: $CINEMA_NAME\n"
+"Screen(s): $SCREENS\n"
+"\n"
 "The KDMs are valid from $START_TIME until $END_TIME.\n"
 "\n"
 "Best regards,\n"
@@ -412,7 +415,7 @@ msgstr "Public Service Announcement"
 msgid "Rating"
 msgstr "Classification"
 
-#: src/lib/config.cc:87 src/lib/config.cc:174
+#: src/lib/config.cc:84 src/lib/config.cc:173
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
@@ -510,7 +513,7 @@ msgstr "Transitional"
 msgid "Unexpected ZIP file contents"
 msgstr "Contenu de fichier ZIP non géré."
 
-#: src/lib/image_proxy.cc:172
+#: src/lib/image_proxy.cc:174
 msgid "Unexpected image type received by server"
 msgstr ""
 
@@ -710,11 +713,11 @@ msgstr "sous-titres non-bitmap non supportés actuellement"
 msgid "remaining"
 msgstr "restant"
 
-#: src/lib/config.cc:85 src/lib/video_content.cc:175
+#: src/lib/config.cc:82 src/lib/video_content.cc:175
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/config.cc:86
+#: src/lib/config.cc:83
 msgid "sRGB non-linearised"
 msgstr "sRGB non linéarisé"
 
diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index 365360260..fb73fa1d0 100644
--- a/src/lib/po/it_IT.po
+++ b/src/lib/po/it_IT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IT VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-21 14:51+0100\n"
+"POT-Creation-Date: 2014-06-23 00:25+0100\n"
 "PO-Revision-Date: 2014-02-03 10:48+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -244,12 +244,16 @@ msgstr ""
 msgid "De-interlacing"
 msgstr "De-interlacciamento"
 
-#: src/lib/config.cc:71
+#: src/lib/config.cc:417
+#, fuzzy
 msgid ""
 "Dear Projectionist\n"
 "\n"
 "Please find attached KDMs for $CPL_NAME.\n"
 "\n"
+"Cinema: $CINEMA_NAME\n"
+"Screen(s): $SCREENS\n"
+"\n"
 "The KDMs are valid from $START_TIME until $END_TIME.\n"
 "\n"
 "Best regards,\n"
@@ -428,7 +432,7 @@ msgstr "Annuncio di pubblico servizio"
 msgid "Rating"
 msgstr "Punteggio"
 
-#: src/lib/config.cc:87 src/lib/config.cc:174
+#: src/lib/config.cc:84 src/lib/config.cc:173
 #, fuzzy
 msgid "Rec. 709"
 msgstr "Rec 709"
@@ -532,7 +536,7 @@ msgstr "Di transizione"
 msgid "Unexpected ZIP file contents"
 msgstr ""
 
-#: src/lib/image_proxy.cc:172
+#: src/lib/image_proxy.cc:174
 msgid "Unexpected image type received by server"
 msgstr ""
 
@@ -733,11 +737,11 @@ msgstr "sottotitoli non-bitmap non ancora supportati"
 msgid "remaining"
 msgstr "restano"
 
-#: src/lib/config.cc:85 src/lib/video_content.cc:175
+#: src/lib/config.cc:82 src/lib/video_content.cc:175
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/config.cc:86
+#: src/lib/config.cc:83
 msgid "sRGB non-linearised"
 msgstr "sRGB non linearizzato"
 
diff --git a/src/lib/po/nl_NL.po b/src/lib/po/nl_NL.po
index eae118175..98f5c918c 100644
--- a/src/lib/po/nl_NL.po
+++ b/src/lib/po/nl_NL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-21 14:51+0100\n"
+"POT-Creation-Date: 2014-06-23 00:25+0100\n"
 "PO-Revision-Date: 2014-03-30 19:39+0100\n"
 "Last-Translator: Theo Kooijmans <tkooijmans@universaldv.nl>\n"
 "Language-Team: UniversalDV <Tkooijmans@universaldv.nl>\n"
@@ -238,12 +238,16 @@ msgstr ""
 msgid "De-interlacing"
 msgstr "De-interlacing"
 
-#: src/lib/config.cc:71
+#: src/lib/config.cc:417
+#, fuzzy
 msgid ""
 "Dear Projectionist\n"
 "\n"
 "Please find attached KDMs for $CPL_NAME.\n"
 "\n"
+"Cinema: $CINEMA_NAME\n"
+"Screen(s): $SCREENS\n"
+"\n"
 "The KDMs are valid from $START_TIME until $END_TIME.\n"
 "\n"
 "Best regards,\n"
@@ -423,7 +427,7 @@ msgstr "Publieke Service aankondiging"
 msgid "Rating"
 msgstr "Beoordeling"
 
-#: src/lib/config.cc:87 src/lib/config.cc:174
+#: src/lib/config.cc:84 src/lib/config.cc:173
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
@@ -521,7 +525,7 @@ msgstr "Bumper"
 msgid "Unexpected ZIP file contents"
 msgstr "Onverwachte ZIP file inhoud"
 
-#: src/lib/image_proxy.cc:172
+#: src/lib/image_proxy.cc:174
 msgid "Unexpected image type received by server"
 msgstr ""
 
@@ -719,11 +723,11 @@ msgstr "non-bitmap ondertitels worden nog niet ondersteund"
 msgid "remaining"
 msgstr "resterend"
 
-#: src/lib/config.cc:85 src/lib/video_content.cc:175
+#: src/lib/config.cc:82 src/lib/video_content.cc:175
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/config.cc:86
+#: src/lib/config.cc:83
 msgid "sRGB non-linearised"
 msgstr "sRGB non-linearised"
 
diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po
index ef2c36d85..f3c0ba9d2 100644
--- a/src/lib/po/sv_SE.po
+++ b/src/lib/po/sv_SE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-21 14:51+0100\n"
+"POT-Creation-Date: 2014-06-23 00:25+0100\n"
 "PO-Revision-Date: 2014-01-19 08:59+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -242,12 +242,16 @@ msgid "De-interlacing"
 msgstr "Avflätning"
 
 # svåröversatt
-#: src/lib/config.cc:71
+#: src/lib/config.cc:417
+#, fuzzy
 msgid ""
 "Dear Projectionist\n"
 "\n"
 "Please find attached KDMs for $CPL_NAME.\n"
 "\n"
+"Cinema: $CINEMA_NAME\n"
+"Screen(s): $SCREENS\n"
+"\n"
 "The KDMs are valid from $START_TIME until $END_TIME.\n"
 "\n"
 "Best regards,\n"
@@ -425,7 +429,7 @@ msgstr "Public Service Announcement"
 msgid "Rating"
 msgstr "Rating"
 
-#: src/lib/config.cc:87 src/lib/config.cc:174
+#: src/lib/config.cc:84 src/lib/config.cc:173
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
@@ -526,7 +530,7 @@ msgstr "Transitional"
 msgid "Unexpected ZIP file contents"
 msgstr ""
 
-#: src/lib/image_proxy.cc:172
+#: src/lib/image_proxy.cc:174
 msgid "Unexpected image type received by server"
 msgstr ""
 
@@ -729,11 +733,11 @@ msgstr "icke-rastergrafiska undertexter stöds inte ännu"
 msgid "remaining"
 msgstr "återstående tid"
 
-#: src/lib/config.cc:85 src/lib/video_content.cc:175
+#: src/lib/config.cc:82 src/lib/video_content.cc:175
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/config.cc:86
+#: src/lib/config.cc:83
 msgid "sRGB non-linearised"
 msgstr "sRGB icke-linjär"