Make DCP creator configurable.

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

diff --git a/src/lib/config.h b/src/lib/config.h
index 312118a55f9e24c7b4e93b140b70fae4fab8e96d..40b65534211439c5a29b19a22a2d417292e57856 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -27,8 +27,8 @@
 #include "isdcf_metadata.h"
 #include "video_content.h"
 #include <dcp/metadata.h>
-#include <dcp/certificates.h>
-#include <dcp/signer.h>
+#include <dcp/certificate.h>
+#include <dcp/certificate_chain.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
 #include <boost/filesystem.hpp>
@@ -90,6 +90,10 @@ public:
                return _servers;
        }
 
+       Protocol tms_protocol () const {
+               return _tms_protocol;
+       }
+
        /** @return The IP address of a TMS that we can copy DCPs to */
        std::string tms_ip () const {
                return _tms_ip;
@@ -151,6 +155,10 @@ public:
                return _dcp_issuer;
        }
 
+       std::string dcp_creator () const {
+               return _dcp_creator;
+       }
+
        int default_j2k_bandwidth () const {
                return _default_j2k_bandwidth;
        }
@@ -195,16 +203,12 @@ public:
                return _kdm_email;
        }
 
-       boost::shared_ptr<const dcp::Signer> signer () const {
-               return _signer;
+       boost::shared_ptr<const dcp::CertificateChain> signer_chain () const {
+               return _signer_chain;
        }
 
-       dcp::Certificate decryption_certificate () const {
-               return _decryption_certificate;
-       }
-
-       std::string decryption_private_key () const {
-               return _decryption_private_key;
+       boost::shared_ptr<const dcp::CertificateChain> decryption_chain () const {
+               return _decryption_chain;
        }
 
        bool check_for_updates () const {
@@ -247,6 +251,10 @@ public:
                maybe_set (_server_port_base, p);
        }
 
+       void set_tms_protocol (Protocol p) {
+               maybe_set (_tms_protocol, p);
+       }
+
        /** @param i IP address of a TMS that we can copy DCPs to */
        void set_tms_ip (std::string i) {
                maybe_set (_tms_ip, i);
@@ -322,6 +330,10 @@ public:
                maybe_set (_dcp_issuer, i);
        }
 
+       void set_dcp_creator (std::string c) {
+               maybe_set (_dcp_creator, c);
+       }
+
        void set_default_j2k_bandwidth (int b) {
                maybe_set (_default_j2k_bandwidth, b);
        }
@@ -368,16 +380,12 @@ public:
 
        void reset_kdm_email ();
 
-       void set_signer (boost::shared_ptr<const dcp::Signer> s) {
-               maybe_set (_signer, s);
+       void set_signer_chain (boost::shared_ptr<const dcp::CertificateChain> s) {
+               maybe_set (_signer_chain, s);
        }
 
-       void set_decryption_certificate (dcp::Certificate c) {
-               maybe_set (_decryption_certificate, c);
-       }
-
-       void set_decryption_private_key (std::string k) {
-               maybe_set (_decryption_private_key, k);
+       void set_decryption_chain (boost::shared_ptr<const dcp::CertificateChain> c) {
+               maybe_set (_decryption_chain, c);
        }
 
        void set_check_for_updates (bool c) {
@@ -417,12 +425,12 @@ public:
        static Config* instance ();
        static void drop ();
        static void restore_defaults ();
+       static bool have_existing ();
 
 private:
        Config ();
-       boost::filesystem::path file () const;
+       static boost::filesystem::path file ();
        void read ();
-       void make_decryption_keys ();
        void set_defaults ();
        void set_kdm_email_to_default ();
 
@@ -447,6 +455,7 @@ private:
        bool _use_any_servers;
        /** J2K encoding servers that should definitely be used */
        std::vector<std::string> _servers;
+       Protocol _tms_protocol;
        /** The IP address of a TMS that we can copy DCPs to */
        std::string _tms_ip;
        /** The path on a TMS that we should write DCPs to */
@@ -468,6 +477,7 @@ private:
        Ratio const * _default_container;
        DCPContentType const * _default_dcp_content_type;
        std::string _dcp_issuer;
+       std::string _dcp_creator;
        int _default_j2k_bandwidth;
        int _default_audio_delay;
        std::list<boost::shared_ptr<Cinema> > _cinemas;
@@ -480,9 +490,11 @@ private:
        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;
+       boost::shared_ptr<const dcp::CertificateChain> _signer_chain;
+       /** Chain used to decrypt KDMs; the leaf of this chain is the target
+        *  certificate for making KDMs given to DCP-o-matic.
+        */
+       boost::shared_ptr<const dcp::CertificateChain> _decryption_chain;
        /** true to check for updates on startup */
        bool _check_for_updates;
        bool _check_for_test_updates;