X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fscreen.h;h=96b0ce76416c1ab878a8f9c0a5238ba47aa0c1a2;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=a564f1ed30b23b4fae242030454bb06c4b69ab31;hpb=c4e10c9a007345cca8594d7bfd23138d56e21d5e;p=dcpomatic.git

diff --git a/src/lib/screen.h b/src/lib/screen.h
index a564f1ed3..96b0ce764 100644
--- a/src/lib/screen.h
+++ b/src/lib/screen.h
@@ -22,6 +22,7 @@
 #define DCPOMATIC_SCREEN_H
 
 #include "kdm_with_metadata.h"
+#include "kdm_recipient.h"
 #include "trusted_device.h"
 #include <dcp/certificate.h>
 #include <libcxml/cxml.h>
@@ -40,14 +41,12 @@ namespace dcpomatic {
  *  `recipient' (i.e. the mediablock) and the certificates/thumbprints
  *  of any trusted devices.
  */
-class Screen
+class Screen : public KDMRecipient
 {
 public:
-	Screen (std::string const & na, std::string const & no, boost::optional<dcp::Certificate> rec, std::vector<TrustedDevice> td)
-		: name (na)
-		, notes (no)
-		, recipient (rec)
-		, trusted_devices (td)
+	Screen (std::string const & name_, std::string const & notes_, boost::optional<dcp::Certificate> recipient_, std::vector<TrustedDevice> trusted_devices_)
+		: KDMRecipient (name_, notes_, recipient_)
+		, trusted_devices (trusted_devices_)
 	{}
 
 	explicit Screen (cxml::ConstNodePtr);
@@ -55,10 +54,7 @@ public:
 	void as_xml (xmlpp::Element *) const;
 	std::vector<std::string> trusted_device_thumbprints () const;
 
-	boost::shared_ptr<Cinema> cinema;
-	std::string name;
-	std::string notes;
-	boost::optional<dcp::Certificate> recipient;
+	std::shared_ptr<Cinema> cinema;
 	std::vector<TrustedDevice> trusted_devices;
 };
 
@@ -66,9 +62,9 @@ public:
 
 KDMWithMetadataPtr
 kdm_for_screen (
-	boost::shared_ptr<const Film> film,
+	std::shared_ptr<const Film> film,
 	boost::filesystem::path cpl,
-	boost::shared_ptr<const dcpomatic::Screen> screen,
+	std::shared_ptr<const dcpomatic::Screen> screen,
 	boost::posix_time::ptime valid_from,
 	boost::posix_time::ptime valid_to,
 	dcp::Formulation formulation,