Use new Windows long filename workaround with disk writer (#1755).

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

diff --git a/src/lib/screen.h b/src/lib/screen.h
index 33c7f280ce32b7d018a9b8c7941db7d75ac5f355..96b0ce76416c1ab878a8f9c0a5238ba47aa0c1a2 100644 (file)
--- a/src/lib/screen.h
+++ b/src/lib/screen.h
@@ -22,6 +22,8 @@
 #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>
 #include <boost/optional.hpp>
@@ -30,24 +32,6 @@
 class Cinema;
 class Film;
 
-class TrustedDevice
-{
-public:
-       explicit TrustedDevice (std::string);
-       explicit TrustedDevice (dcp::Certificate);
-
-       boost::optional<dcp::Certificate> certificate () const {
-               return _certificate;
-       }
-
-       std::string thumbprint () const;
-       std::string as_string () const;
-
-private:
-       boost::optional<dcp::Certificate> _certificate;
-       boost::optional<std::string> _thumbprint;
-};
-
 namespace dcpomatic {
 
 /** @class Screen
@@ -57,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);
@@ -72,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;
 };
 
@@ -83,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,