Logging improvements to allow prettier displays in the server GUI.

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

diff --git a/src/lib/config.h b/src/lib/config.h
index 70971085a907176383f4b2ff08a330284c1c29bb..579527975db2153892302d32232215b974f77da5 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -25,18 +25,13 @@
 #define DCPOMATIC_CONFIG_H
 
 #include "isdcf_metadata.h"
-#include "video_content.h"
-#include <dcp/metadata.h>
-#include <dcp/certificate.h>
+#include "types.h"
 #include <dcp/certificate_chain.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
 #include <boost/filesystem.hpp>
 #include <vector>
 
-class ServerDescription;
-class Scaler;
-class Filter;
 class CinemaSoundProcessor;
 class DCPContentType;
 class Ratio;
@@ -90,6 +85,10 @@ public:
                return _servers;
        }
 
+       bool only_servers_encode () const {
+               return _only_servers_encode;
+       }
+
        Protocol tms_protocol () const {
                return _tms_protocol;
        }
@@ -155,6 +154,10 @@ public:
                return _dcp_issuer;
        }
 
+       std::string dcp_creator () const {
+               return _dcp_creator;
+       }
+
        int default_j2k_bandwidth () const {
                return _default_j2k_bandwidth;
        }
@@ -163,6 +166,10 @@ public:
                return _default_audio_delay;
        }
 
+       bool default_interop () const {
+               return _default_interop;
+       }
+
        std::string mail_server () const {
                return _mail_server;
        }
@@ -223,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;
@@ -247,6 +258,10 @@ public:
                maybe_set (_server_port_base, p);
        }
 
+       void set_only_servers_encode (bool o) {
+               maybe_set (_only_servers_encode, o);
+       }
+
        void set_tms_protocol (Protocol p) {
                maybe_set (_tms_protocol, p);
        }
@@ -326,6 +341,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);
        }
@@ -334,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);
        }
@@ -396,6 +419,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);
@@ -421,7 +448,7 @@ 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 ();
@@ -447,6 +474,7 @@ private:
        bool _use_any_servers;
        /** J2K encoding servers that should definitely be used */
        std::vector<std::string> _servers;
+       bool _only_servers_encode;
        Protocol _tms_protocol;
        /** The IP address of a TMS that we can copy DCPs to */
        std::string _tms_ip;
@@ -469,8 +497,10 @@ 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;
+       bool _default_interop;
        std::list<boost::shared_ptr<Cinema> > _cinemas;
        std::string _mail_server;
        int _mail_port;
@@ -492,6 +522,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