Display the filename / URL that a screen certificate was obtained from (#1894).

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

diff --git a/src/lib/screen.h b/src/lib/screen.h
index 013afff856627f43bfd477921418c0b6dfde67cc..6103d207d9bffc0870edbd194cee96ab75d56936 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,9 +18,11 @@
 
 */
 
+
 #ifndef DCPOMATIC_SCREEN_H
 #define DCPOMATIC_SCREEN_H
 
+
 #include "kdm_with_metadata.h"
 #include "kdm_recipient.h"
 #include "trusted_device.h"
@@ -29,11 +31,14 @@
 #include <boost/optional.hpp>
 #include <string>
 
+
 class Cinema;
 class Film;
 
+
 namespace dcpomatic {
 
+
 /** @class Screen
  *  @brief A representation of a Screen for KDM generation.
  *
@@ -44,8 +49,14 @@ 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_)
        {}
 
@@ -54,17 +65,18 @@ public:
        void as_xml (xmlpp::Element *) const;
        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,
+       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,