Derive Screen from a new class KDMRecipient.

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

diff --git a/src/lib/screen.h b/src/lib/screen.h
index abc229ec657f6531cfaa73c1b927e9c8be7edd4b..8eb7b41610b6b8eea635202cc622ae3dea9e6587 100644 (file)
--- a/src/lib/screen.h
+++ b/src/lib/screen.h
@@ -21,6 +21,7 @@
 #ifndef DCPOMATIC_SCREEN_H
 #define DCPOMATIC_SCREEN_H
 
+#include "kdm_recipient.h"
 #include "trusted_device.h"
 #include <dcp/certificate.h>
 #include <libcxml/cxml.h>
@@ -38,14 +39,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);
@@ -54,9 +53,6 @@ public:
        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::vector<TrustedDevice> trusted_devices;
 };