Basics of send-to-batch-converter; not tested on Windows nor OS X.

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

diff --git a/src/lib/config.h b/src/lib/config.h
index 9d583ff6dbd39d46ea7f22dc00d39808b9a614ff..664020a2a2fef500a257476bf0825d92375a02bc 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -166,6 +166,10 @@ public:
                return _default_audio_delay;
        }
 
+       bool default_interop () const {
+               return _default_interop;
+       }
+
        std::string mail_server () const {
                return _mail_server;
        }
@@ -226,6 +230,10 @@ public:
                return _log_types;
        }
 
+       bool automatic_audio_analysis () const {
+               return _automatic_audio_analysis;
+       }
+
 #ifdef DCPOMATIC_WINDOWS
        bool win32_console () const {
                return _win32_console;
@@ -345,6 +353,10 @@ public:
                maybe_set (_default_audio_delay, d);
        }
 
+       void set_default_interop (bool i) {
+               maybe_set (_default_interop, i);
+       }
+
        void set_mail_server (std::string s) {
                maybe_set (_mail_server, s);
        }
@@ -393,6 +405,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) {
@@ -407,6 +422,10 @@ public:
                maybe_set (_log_types, t);
        }
 
+       void set_automatic_audio_analysis (bool a) {
+               maybe_set (_automatic_audio_analysis, a);
+       }
+
 #ifdef DCPOMATIC_WINDOWS
        void set_win32_console (bool c) {
                maybe_set (_win32_console, c);
@@ -432,10 +451,11 @@ public:
 
 private:
        Config ();
-       static boost::filesystem::path file ();
+       static boost::filesystem::path file (bool create_directories = true);
        void read ();
        void set_defaults ();
        void set_kdm_email_to_default ();
+       boost::shared_ptr<dcp::CertificateChain> create_certificate_chain ();
 
        template <class T>
        void maybe_set (T& member, T new_value) {
@@ -451,7 +471,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 */
@@ -484,6 +504,7 @@ private:
        std::string _dcp_creator;
        int _default_j2k_bandwidth;
        int _default_audio_delay;
+       bool _default_interop;
        std::list<boost::shared_ptr<Cinema> > _cinemas;
        std::string _mail_server;
        int _mail_port;
@@ -505,6 +526,7 @@ private:
        /** maximum allowed J2K bandwidth in bits per second */
        int _maximum_j2k_bandwidth;
        int _log_types;
+       bool _automatic_audio_analysis;
 #ifdef DCPOMATIC_WINDOWS
        bool _win32_console;
 #endif