X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fscreen.h;h=84cecb80b4853991cc85b6bfb1c9e95091dceb3c;hb=HEAD;hp=15a0785d566c5292efa5e1ffff5c53a289ecb1b4;hpb=689fa55d1529ad88449ca464e9107c4dcc54d1cb;p=dcpomatic.git

diff --git a/src/lib/screen.h b/src/lib/screen.h
index 15a0785d5..7f01cdf27 100644
--- a/src/lib/screen.h
+++ b/src/lib/screen.h
@@ -25,8 +25,10 @@
 
 #include "kdm_with_metadata.h"
 #include "kdm_recipient.h"
+#include "kdm_util.h"
 #include "trusted_device.h"
 #include <dcp/certificate.h>
+#include <dcp/decrypted_kdm.h>
 #include <libcxml/cxml.h>
 #include <boost/optional.hpp>
 #include <string>
@@ -49,14 +51,20 @@ namespace dcpomatic {
 class Screen : public KDMRecipient
 {
 public:
-	Screen (std::string const & name_, std::string const & notes_, boost::optional<dcp::Certificate> recipient_, std::vector<TrustedDevice> trusted_devices_)
-		: KDMRecipient (name_, notes_, recipient_)
+	Screen (
+		std::string const & name_,
+		std::string const & notes_,
+		boost::optional<dcp::Certificate> recipient_,
+		boost::optional<std::string> recipient_file_,
+		std::vector<TrustedDevice> trusted_devices_
+	       )
+		: KDMRecipient (name_, notes_, recipient_, recipient_file_)
 		, trusted_devices (trusted_devices_)
 	{}
 
 	explicit Screen (cxml::ConstNodePtr);
 
-	void as_xml (xmlpp::Element *) const;
+	void as_xml (xmlpp::Element *) const override;
 	std::vector<std::string> trusted_device_thumbprints () const;
 
 	std::shared_ptr<Cinema> cinema;
@@ -68,14 +76,14 @@ public:
 
 KDMWithMetadataPtr
 kdm_for_screen (
-	std::shared_ptr<const Film> film,
-	boost::filesystem::path cpl,
+	std::function<dcp::DecryptedKDM (dcp::LocalTime, dcp::LocalTime)> make_kdm,
 	std::shared_ptr<const dcpomatic::Screen> screen,
 	boost::posix_time::ptime valid_from,
 	boost::posix_time::ptime valid_to,
 	dcp::Formulation formulation,
 	bool disable_forensic_marking_picture,
-	boost::optional<int> disable_forensic_marking_audio
+	boost::optional<int> disable_forensic_marking_audio,
+	std::vector<KDMCertificatePeriod>& period_checks
 	);