Fix assertion failure on opening content properties (#816).

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

diff --git a/src/lib/config.h b/src/lib/config.h
index 049b3663c70b416f1144cc786301cceba0638bd5..e5795d2c300db8ac02b02cb4c6f97369d713900d 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -231,6 +231,10 @@ public:
                return _log_types;
        }
 
+       bool analyse_ebur128 () const {
+               return _analyse_ebur128;
+       }
+
        bool automatic_audio_analysis () const {
                return _automatic_audio_analysis;
        }
@@ -249,6 +253,10 @@ public:
                return _dkdms;
        }
 
+       boost::filesystem::path cinemas_file () const {
+               return _cinemas_file;
+       }
+
        /** @param n New number of local encoding threads */
        void set_num_local_encoding_threads (int n) {
                maybe_set (_num_local_encoding_threads, n);
@@ -427,6 +435,10 @@ public:
                maybe_set (_log_types, t);
        }
 
+       void set_analyse_ebur128 (bool a) {
+               maybe_set (_analyse_ebur128, a);
+       }
+
        void set_automatic_audio_analysis (bool a) {
                maybe_set (_automatic_audio_analysis, a);
        }
@@ -443,6 +455,8 @@ public:
                changed ();
        }
 
+       void set_cinemas_file (boost::filesystem::path file);
+
        void clear_history () {
                _history.clear ();
                changed ();
@@ -458,14 +472,17 @@ public:
        static Config* instance ();
        static void drop ();
        static void restore_defaults ();
-       static bool have_existing ();
+       static bool have_existing (std::string);
 
 private:
        Config ();
-       static boost::filesystem::path file (bool create_directories = true);
+       static boost::filesystem::path path (std::string file, bool create_directories = true);
        void read ();
        void set_defaults ();
        void set_kdm_email_to_default ();
+       void write_config_xml () const;
+       void write_cinemas_xml () const;
+       void read_cinemas (cxml::Document const & f);
        boost::shared_ptr<dcp::CertificateChain> create_certificate_chain ();
 
        template <class T>
@@ -537,12 +554,14 @@ private:
        /** maximum allowed J2K bandwidth in bits per second */
        int _maximum_j2k_bandwidth;
        int _log_types;
+       bool _analyse_ebur128;
        bool _automatic_audio_analysis;
 #ifdef DCPOMATIC_WINDOWS
        bool _win32_console;
 #endif
        std::vector<boost::filesystem::path> _history;
        std::vector<dcp::EncryptedKDM> _dkdms;
+       boost::filesystem::path _cinemas_file;
 
        /** Singleton instance, or 0 */
        static Config* _instance;