Merge master.

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

diff --git a/src/lib/config.h b/src/lib/config.h
index 66ff662142133b6e4258b49c745b93759430252f..310d3c6f5e2ca4624761c1b22ab44fa95e85ebc6 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -29,6 +29,8 @@
 #include <boost/signals2.hpp>
 #include <boost/filesystem.hpp>
 #include <dcp/metadata.h>
+#include <dcp/certificates.h>
+#include <dcp/signer.h>
 #include "isdcf_metadata.h"
 #include "colour_conversion.h"
 
@@ -132,6 +134,10 @@ public:
                return _default_still_length;
        }
 
+       Ratio const * default_scale () const {
+               return _default_scale;
+       }
+
        Ratio const * default_container () const {
                return _default_container;
        }
@@ -179,11 +185,27 @@ public:
        std::string kdm_cc () const {
                return _kdm_cc;
        }
+
+       std::string kdm_bcc () const {
+               return _kdm_bcc;
+       }
        
        std::string kdm_email () const {
                return _kdm_email;
        }
 
+       boost::shared_ptr<const dcp::Signer> signer () const {
+               return _signer;
+       }
+
+       dcp::Certificate decryption_certificate () const {
+               return _decryption_certificate;
+       }
+
+       std::string decryption_private_key () const {
+               return _decryption_private_key;
+       }
+
        bool check_for_updates () const {
                return _check_for_updates;
        }
@@ -281,6 +303,11 @@ public:
                changed ();
        }
 
+       void set_default_scale (Ratio const * s) {
+               _default_scale = s;
+               changed ();
+       }
+
        void set_default_container (Ratio const * c) {
                _default_container = c;
                changed ();
@@ -340,6 +367,11 @@ public:
                _kdm_cc = f;
                changed ();
        }
+
+       void set_kdm_bcc (std::string f) {
+               _kdm_bcc = f;
+               changed ();
+       }
        
        void set_kdm_email (std::string e) {
                _kdm_email = e;
@@ -348,6 +380,21 @@ public:
 
        void reset_kdm_email ();
 
+       void set_signer (boost::shared_ptr<const dcp::Signer> s) {
+               _signer = s;
+               changed ();
+       }
+
+       void set_decryption_certificate (dcp::Certificate c) {
+               _decryption_certificate = c;
+               changed ();
+       }
+
+       void set_decryption_private_key (std::string k) {
+               _decryption_private_key = k;
+               changed ();
+       }
+
        void set_check_for_updates (bool c) {
                _check_for_updates = c;
                changed ();
@@ -368,8 +415,6 @@ public:
                changed ();
        }
        
-       boost::filesystem::path signer_chain_directory () const;
-
        void changed ();
        boost::signals2::signal<void ()> Changed;
 
@@ -411,6 +456,7 @@ private:
        ISDCFMetadata _default_isdcf_metadata;
        boost::optional<std::string> _language;
        int _default_still_length;
+       Ratio const * _default_scale;
        Ratio const * _default_container;
        DCPContentType const * _default_dcp_content_type;
        dcp::XMLMetadata _dcp_metadata;
@@ -424,7 +470,11 @@ private:
        std::string _kdm_subject;
        std::string _kdm_from;
        std::string _kdm_cc;
+       std::string _kdm_bcc;
        std::string _kdm_email;
+       boost::shared_ptr<const dcp::Signer> _signer;
+       dcp::Certificate _decryption_certificate;
+       std::string _decryption_private_key;
        /** true to check for updates on startup */
        bool _check_for_updates;
        bool _check_for_test_updates;