diff options
Diffstat (limited to 'src/lib/screen.h')
| -rw-r--r-- | src/lib/screen.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/lib/screen.h b/src/lib/screen.h index 7f01cdf27..89ebc3ab4 100644 --- a/src/lib/screen.h +++ b/src/lib/screen.h @@ -23,12 +23,14 @@ #define DCPOMATIC_SCREEN_H -#include "kdm_with_metadata.h" +#include "cinema_list.h" #include "kdm_recipient.h" #include "kdm_util.h" +#include "kdm_with_metadata.h" #include "trusted_device.h" #include <dcp/certificate.h> #include <dcp/decrypted_kdm.h> +#include <dcp/utc_offset.h> #include <libcxml/cxml.h> #include <boost/optional.hpp> #include <string> @@ -62,12 +64,7 @@ public: , trusted_devices (trusted_devices_) {} - explicit Screen (cxml::ConstNodePtr); - - void as_xml (xmlpp::Element *) const override; std::vector<std::string> trusted_device_thumbprints () const; - - std::shared_ptr<Cinema> cinema; std::vector<TrustedDevice> trusted_devices; }; @@ -77,9 +74,11 @@ public: KDMWithMetadataPtr kdm_for_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, + CinemaID cinema_id, + Cinema const& cinema, + dcpomatic::Screen const& screen, + dcp::LocalTime valid_from, + dcp::LocalTime valid_to, dcp::Formulation formulation, bool disable_forensic_marking_picture, boost::optional<int> disable_forensic_marking_audio, |