Supporters update.

[dcpomatic.git] / src / lib / screen.h

diff --git a/src/lib/screen.h b/src/lib/screen.h
index 013afff856627f43bfd477921418c0b6dfde67cc..7f01cdf2792abb802f200b40fb1045f21b89a7c2 100644 (file)
--- a/src/lib/screen.h
+++ b/src/lib/screen.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,22 +18,29 @@
 
 */
 
+
 #ifndef DCPOMATIC_SCREEN_H
 #define DCPOMATIC_SCREEN_H
 
+
 #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>
 
+
 class Cinema;
 class Film;
 
+
 namespace dcpomatic {
 
+
 /** @class Screen
  *  @brief A representation of a Screen for KDM generation.
  *
@@ -44,32 +51,39 @@ 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;
 
-       boost::shared_ptr<Cinema> cinema;
+       std::shared_ptr<Cinema> cinema;
        std::vector<TrustedDevice> trusted_devices;
 };
 
 }
 
+
 KDMWithMetadataPtr
 kdm_for_screen (
-       boost::shared_ptr<const Film> film,
-       boost::filesystem::path cpl,
-       boost::shared_ptr<const dcpomatic::Screen> screen,
+       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
        );