Merge.

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

diff --git a/src/lib/config.h b/src/lib/config.h
index 9c1f231611e33b5e5b77a03004ac3311886b9c42..049b3663c70b416f1144cc786301cceba0638bd5 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -27,6 +27,7 @@
 #include "isdcf_metadata.h"
 #include "types.h"
 #include <dcp/certificate_chain.h>
+#include <dcp/encrypted_kdm.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
 #include <boost/filesystem.hpp>
@@ -194,7 +195,7 @@ public:
                return _kdm_from;
        }
 
-       std::string kdm_cc () const {
+       std::vector<std::string> kdm_cc () const {
                return _kdm_cc;
        }
 
@@ -244,6 +245,10 @@ public:
                return _history;
        }
 
+       std::vector<dcp::EncryptedKDM> dkdms () const {
+               return _dkdms;
+       }
+
        /** @param n New number of local encoding threads */
        void set_num_local_encoding_threads (int n) {
                maybe_set (_num_local_encoding_threads, n);
@@ -381,7 +386,7 @@ public:
                maybe_set (_kdm_from, f);
        }
 
-       void set_kdm_cc (std::string f) {
+       void set_kdm_cc (std::vector<std::string> f) {
                maybe_set (_kdm_cc, f);
        }
 
@@ -405,6 +410,9 @@ public:
 
        void set_check_for_updates (bool c) {
                maybe_set (_check_for_updates, c);
+               if (!c) {
+                       set_check_for_test_updates (false);
+               }
        }
 
        void set_check_for_test_updates (bool c) {
@@ -429,6 +437,12 @@ public:
        }
 #endif
 
+       void set_dkdms (std::vector<dcp::EncryptedKDM> dkdms)
+       {
+               _dkdms = dkdms;
+               changed ();
+       }
+
        void clear_history () {
                _history.clear ();
                changed ();
@@ -468,7 +482,7 @@ private:
        /** default directory to put new films in */
        boost::filesystem::path _default_directory;
        /** base port number to use for J2K encoding servers;
-        *  this port and the one above it will be used.
+        *  this port and the two above it will be used.
         */
        int _server_port_base;
        /** true to broadcast on the `any' address to look for servers */
@@ -509,7 +523,7 @@ private:
        std::string _mail_password;
        std::string _kdm_subject;
        std::string _kdm_from;
-       std::string _kdm_cc;
+       std::vector<std::string> _kdm_cc;
        std::string _kdm_bcc;
        std::string _kdm_email;
        boost::shared_ptr<const dcp::CertificateChain> _signer_chain;
@@ -528,6 +542,7 @@ private:
        bool _win32_console;
 #endif
        std::vector<boost::filesystem::path> _history;
+       std::vector<dcp::EncryptedKDM> _dkdms;
 
        /** Singleton instance, or 0 */
        static Config* _instance;