Tidy up careful_string_filter and add some extra transliterations.

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

diff --git a/src/lib/screen.h b/src/lib/screen.h
index 15a0785d566c5292efa5e1ffff5c53a289ecb1b4..84cecb80b4853991cc85b6bfb1c9e95091dceb3c 100644 (file)
--- a/src/lib/screen.h
+++ b/src/lib/screen.h
@@ -49,14 +49,20 @@ 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_)
        {}
 
        explicit Screen (cxml::ConstNodePtr);
 
-       void as_xml (xmlpp::Element *) const;
+       void as_xml (xmlpp::Element *) const override;
        std::vector<std::string> trusted_device_thumbprints () const;
 
        std::shared_ptr<Cinema> cinema;