X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fscreen.h;h=013afff856627f43bfd477921418c0b6dfde67cc;hb=60f3f8ff110d55e0d720784dd40c9bc62d342d2c;hp=a564f1ed30b23b4fae242030454bb06c4b69ab31;hpb=c4e10c9a007345cca8594d7bfd23138d56e21d5e;p=dcpomatic.git diff --git a/src/lib/screen.h b/src/lib/screen.h index a564f1ed3..013afff85 100644 --- a/src/lib/screen.h +++ b/src/lib/screen.h @@ -22,6 +22,7 @@ #define DCPOMATIC_SCREEN_H #include "kdm_with_metadata.h" +#include "kdm_recipient.h" #include "trusted_device.h" #include #include @@ -40,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 rec, std::vector td) - : name (na) - , notes (no) - , recipient (rec) - , trusted_devices (td) + Screen (std::string const & name_, std::string const & notes_, boost::optional recipient_, std::vector trusted_devices_) + : KDMRecipient (name_, notes_, recipient_) + , trusted_devices (trusted_devices_) {} explicit Screen (cxml::ConstNodePtr); @@ -56,9 +55,6 @@ public: std::vector trusted_device_thumbprints () const; boost::shared_ptr cinema; - std::string name; - std::string notes; - boost::optional recipient; std::vector trusted_devices; };