From: Carl Hetherington <cth@carlh.net>
Date: Sun, 15 Nov 2015 01:17:12 +0000 (+0000)
Subject: Rename certificate -> recipient in Screen.
X-Git-Tag: v2.5.4~13
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=ffa5a512112809e2256cae7a01afcd14c99c83a6

Rename certificate -> recipient in Screen.
---

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 4691925bc..d406152a1 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -1143,8 +1143,8 @@ Film::make_kdms (
 	list<ScreenKDM> kdms;
 
 	BOOST_FOREACH (shared_ptr<Screen> i, screens) {
-		if (i->certificate) {
-			kdms.push_back (ScreenKDM (i, make_kdm (i->certificate.get(), dcp, from, until, formulation)));
+		if (i->recipient) {
+			kdms.push_back (ScreenKDM (i, make_kdm (i->recipient.get(), dcp, from, until, formulation)));
 		}
 	}
 
diff --git a/src/lib/screen.cc b/src/lib/screen.cc
index 347e1d655..0876e770b 100644
--- a/src/lib/screen.cc
+++ b/src/lib/screen.cc
@@ -24,7 +24,9 @@ Screen::Screen (cxml::ConstNodePtr node)
 	: name (node->string_child ("Name"))
 {
 	if (node->optional_string_child ("Certificate")) {
-		certificate = dcp::Certificate (node->string_child ("Certificate"));
+		recipient = dcp::Certificate (node->string_child ("Certificate"));
+	} else if (node->optional_string_child ("Recipient")) {
+		recipient = dcp::Certificate (node->string_child ("Recipient"));
 	}
 }
 
@@ -32,7 +34,7 @@ void
 Screen::as_xml (xmlpp::Element* parent) const
 {
 	parent->add_child("Name")->add_child_text (name);
-	if (certificate) {
-		parent->add_child("Certificate")->add_child_text (certificate->certificate (true));
+	if (recipient) {
+		parent->add_child("Recipient")->add_child_text (recipient->certificate (true));
 	}
 }
diff --git a/src/lib/screen.h b/src/lib/screen.h
index 6bac3ec14..6e3b8b01d 100644
--- a/src/lib/screen.h
+++ b/src/lib/screen.h
@@ -28,14 +28,14 @@ class Cinema;
  *  @brief A representation of a Screen for KDM generation.
  *
  *  This is the name of the screen and the certificate of its
- *  server.
+ *  `recipient' (i.e. the servers).
  */
 class Screen
 {
 public:
-	Screen (std::string const & n, boost::optional<dcp::Certificate> cert)
+	Screen (std::string const & n, boost::optional<dcp::Certificate> rec)
 		: name (n)
-		, certificate (cert)
+		, recipient (rec)
 	{}
 
 	Screen (cxml::ConstNodePtr);
@@ -44,5 +44,5 @@ public:
 
 	boost::shared_ptr<Cinema> cinema;
 	std::string name;
-	boost::optional<dcp::Certificate> certificate;
+	boost::optional<dcp::Certificate> recipient;
 };
diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 6190f1416..2c96f37b2 100644
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -264,7 +264,7 @@ private:
 			list<ScreenKDM> screen_kdms;
 			BOOST_FOREACH (shared_ptr<Screen> i, _screens->screens()) {
 
-				if (!i->certificate) {
+				if (!i->recipient) {
 					continue;
 				}
 
@@ -279,7 +279,7 @@ private:
 				}
 
 				/* Encrypt */
-				screen_kdms.push_back (ScreenKDM (i, kdm.encrypt (signer, i->certificate.get(), _output->formulation())));
+				screen_kdms.push_back (ScreenKDM (i, kdm.encrypt (signer, i->recipient.get(), _output->formulation())));
 			}
 
 			if (_output->write_to()) {
diff --git a/src/wx/screens_panel.cc b/src/wx/screens_panel.cc
index 4f8e3ad4d..2d47b65b5 100644
--- a/src/wx/screens_panel.cc
+++ b/src/wx/screens_panel.cc
@@ -244,10 +244,10 @@ ScreensPanel::edit_screen_clicked ()
 
 	pair<wxTreeItemId, shared_ptr<Screen> > s = selected_screens().front();
 
-	ScreenDialog* d = new ScreenDialog (this, "Edit screen", s.second->name, s.second->certificate);
+	ScreenDialog* d = new ScreenDialog (this, "Edit screen", s.second->name, s.second->recipient);
 	if (d->ShowModal () == wxID_OK) {
 		s.second->name = d->name ();
-		s.second->certificate = d->certificate ();
+		s.second->recipient = d->certificate ();
 		_targets->SetItemText (s.first, std_to_wx (d->name()));
 		Config::instance()->changed ();
 	}