Supporters update.
[dcpomatic.git] / src / lib / config.h
index e3a34aed3787f0eebc5d40b81fdc2c74725b54ef..f3d080b0bdc4552c00055418695a003d0f6d7814 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2022 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
  *  @brief Class holding configuration.
  */
 
+
 #ifndef DCPOMATIC_CONFIG_H
 #define DCPOMATIC_CONFIG_H
 
-#include "isdcf_metadata.h"
-#include "types.h"
-#include "edid.h"
+
+#include "audio_mapping.h"
+#include "export_config.h"
+#include "rough_duration.h"
+#include "state.h"
 #include <dcp/name_format.h>
 #include <dcp/certificate_chain.h>
 #include <dcp/encrypted_kdm.h>
-#include <boost/shared_ptr.hpp>
+#include <dcp/language_tag.h>
 #include <boost/signals2.hpp>
 #include <boost/filesystem.hpp>
 #include <vector>
 
+
+class Cinema;
 class CinemaSoundProcessor;
 class DCPContentType;
-class Ratio;
-class Cinema;
-class Film;
 class DKDMGroup;
+class DKDMRecipient;
+class Film;
+class Ratio;
+
+
+extern void save_all_config_as_zip (boost::filesystem::path zip_file);
+
 
 /** @class Config
  *  @brief A singleton class holding configuration.
  */
-class Config : public boost::noncopyable
+class Config : public State
 {
 public:
        /** @return number of threads which a master DoM should use for J2K encoding on the local machine */
@@ -70,19 +79,24 @@ public:
        boost::filesystem::path default_directory_or (boost::filesystem::path a) const;
        boost::filesystem::path default_kdm_directory_or (boost::filesystem::path a) const;
 
+       void load_from_zip(boost::filesystem::path zip_file);
+
        enum Property {
                USE_ANY_SERVERS,
                SERVERS,
                CINEMAS,
+               DKDM_RECIPIENTS,
                SOUND,
                SOUND_OUTPUT,
-               INTERFACE_COMPLEXITY,
                PLAYER_CONTENT_DIRECTORY,
                PLAYER_PLAYLIST_DIRECTORY,
+               PLAYER_DEBUG_LOG,
                HISTORY,
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-               PLAYER_BACKGROUND_IMAGE,
-#endif
+               SHOW_EXPERIMENTAL_AUDIO_PROCESSORS,
+               AUDIO_MAPPING,
+               AUTO_CROP_THRESHOLD,
+               ALLOW_SMPTE_BV20,
+               ISDCF_NAME_PART_LENGTH,
                OTHER
        };
 
@@ -115,10 +129,14 @@ public:
                return _only_servers_encode;
        }
 
-       Protocol tms_protocol () const {
+       FileTransferProtocol tms_protocol () const {
                return _tms_protocol;
        }
 
+       bool tms_passive() const {
+               return _tms_passive;
+       }
+
        /** @return The IP address of a TMS that we can copy DCPs to */
        std::string tms_ip () const {
                return _tms_ip;
@@ -139,13 +157,12 @@ public:
                return _tms_password;
        }
 
-       /** @return The cinema sound processor that we are using */
-       CinemaSoundProcessor const * cinema_sound_processor () const {
-               return _cinema_sound_processor;
+       std::list<std::shared_ptr<Cinema>> cinemas () const {
+               return _cinemas;
        }
 
-       std::list<boost::shared_ptr<Cinema> > cinemas () const {
-               return _cinemas;
+       std::list<std::shared_ptr<DKDMRecipient>> dkdm_recipients () const {
+               return _dkdm_recipients;
        }
 
        std::list<int> allowed_dcp_frame_rates () const {
@@ -160,24 +177,24 @@ public:
                return _allow_any_container;
        }
 
-       ISDCFMetadata default_isdcf_metadata () const {
-               return _default_isdcf_metadata;
+       bool allow_96khz_audio () const {
+               return _allow_96khz_audio;
        }
 
-       boost::optional<std::string> language () const {
-               return _language;
+       bool use_all_audio_channels () const {
+               return _use_all_audio_channels;
        }
 
-       int default_still_length () const {
-               return _default_still_length;
+       bool show_experimental_audio_processors () const {
+               return _show_experimental_audio_processors;
        }
 
-       Ratio const * default_container () const {
-               return _default_container;
+       boost::optional<std::string> language () const {
+               return _language;
        }
 
-       Ratio const * default_scale_to () const {
-               return _default_scale_to;
+       int default_still_length () const {
+               return _default_still_length;
        }
 
        DCPContentType const * default_dcp_content_type () const {
@@ -196,6 +213,22 @@ public:
                return _dcp_creator;
        }
 
+       std::string dcp_company_name () const {
+               return _dcp_company_name;
+       }
+
+       std::string dcp_product_name () const {
+               return _dcp_product_name;
+       }
+
+       std::string dcp_product_version () const {
+               return _dcp_product_version;
+       }
+
+       std::string dcp_j2k_comment () const {
+               return _dcp_j2k_comment;
+       }
+
        int default_j2k_bandwidth () const {
                return _default_j2k_bandwidth;
        }
@@ -208,8 +241,20 @@ public:
                return _default_interop;
        }
 
-       bool default_upload_after_make_dcp () {
-               return _default_upload_after_make_dcp;
+       boost::optional<dcp::LanguageTag> default_audio_language() const {
+               return _default_audio_language;
+       }
+
+       boost::optional<dcp::LanguageTag::RegionSubtag> default_territory() const {
+               return _default_territory;
+       }
+
+       std::map<std::string, std::string> default_metadata () const {
+               return _default_metadata;
+       }
+
+       bool upload_after_make_dcp () {
+               return _upload_after_make_dcp;
        }
 
        void set_default_kdm_directory (boost::filesystem::path d) {
@@ -228,6 +273,10 @@ public:
                return _mail_port;
        }
 
+       EmailProtocol mail_protocol () const {
+               return _mail_protocol;
+       }
+
        std::string mail_user () const {
                return _mail_user;
        }
@@ -280,11 +329,11 @@ public:
                return _notification_email;
        }
 
-       boost::shared_ptr<const dcp::CertificateChain> signer_chain () const {
+       std::shared_ptr<const dcp::CertificateChain> signer_chain () const {
                return _signer_chain;
        }
 
-       boost::shared_ptr<const dcp::CertificateChain> decryption_chain () const {
+       std::shared_ptr<const dcp::CertificateChain> decryption_chain () const {
                return _decryption_chain;
        }
 
@@ -326,7 +375,7 @@ public:
                return _player_history;
        }
 
-       boost::shared_ptr<DKDMGroup> dkdms () const {
+       std::shared_ptr<DKDMGroup> dkdms () const {
                return _dkdms;
        }
 
@@ -334,6 +383,10 @@ public:
                return _cinemas_file;
        }
 
+       boost::filesystem::path dkdm_recipients_file () const {
+               return _dkdm_recipients_file;
+       }
+
        bool show_hints_before_make_dcp () const {
                return _show_hints_before_make_dcp;
        }
@@ -350,6 +403,10 @@ public:
                return _kdm_filename_format;
        }
 
+       dcp::NameFormat dkdm_filename_format () const {
+               return _dkdm_filename_format;
+       }
+
        dcp::NameFormat dcp_metadata_filename_format () const {
                return _dcp_metadata_filename_format;
        }
@@ -362,13 +419,20 @@ public:
                return _jump_to_selected;
        }
 
+       /* This could be an enum class but we use the enum a lot to index _nagged
+        * so it means a lot of casts.
+        */
        enum Nag {
                NAG_DKDM_CONFIG,
                NAG_ENCRYPTED_METADATA,
-               NAG_REMAKE_DECRYPTION_CHAIN,
-               NAG_BAD_SIGNER_CHAIN,
-               /* Not really a nag but it's the same idea */
-               NAG_INITIAL_SETUP,
+               NAG_ALTER_DECRYPTION_CHAIN,
+               NAG_BAD_SIGNER_CHAIN_UTF8,
+               NAG_IMPORT_DECRYPTION_CHAIN,
+               NAG_DELETE_DKDM,
+               NAG_32_ON_64,
+               NAG_TOO_MANY_DROPPED_FRAMES,
+               NAG_BAD_SIGNER_CHAIN_VALIDITY,
+               NAG_BAD_SIGNER_DN_QUALIFIER,
                NAG_COUNT
        };
 
@@ -457,19 +521,10 @@ public:
                return _gdc_password;
        }
 
-       enum Interface {
-               INTERFACE_SIMPLE,
-               INTERFACE_FULL
-       };
-
-       Interface interface_complexity () const {
-               return _interface_complexity;
-       }
-
        enum PlayerMode {
-               PLAYER_MODE_WINDOW,
-               PLAYER_MODE_FULL,
-               PLAYER_MODE_DUAL
+               PLAYER_MODE_WINDOW, ///< one window containing image and controls
+               PLAYER_MODE_FULL,   ///< just the image filling the screen
+               PLAYER_MODE_DUAL    ///< image on one monitor and extended controls on the other
        };
 
        PlayerMode player_mode () const {
@@ -480,12 +535,21 @@ public:
                return _image_display;
        }
 
+       enum VideoViewType {
+               VIDEO_VIEW_SIMPLE,
+               VIDEO_VIEW_OPENGL
+       };
+
+       VideoViewType video_view_type () const {
+               return _video_view_type;
+       }
+
        bool respect_kdm_validity_periods () const {
                return _respect_kdm_validity_periods;
        }
 
-       boost::optional<boost::filesystem::path> player_log_file () const {
-               return _player_log_file;
+       boost::optional<boost::filesystem::path> player_debug_log_file () const {
+               return _player_debug_log_file;
        }
 
        boost::optional<boost::filesystem::path> player_content_directory () const {
@@ -500,35 +564,66 @@ public:
                return _player_kdm_directory;
        }
 
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-       boost::optional<boost::filesystem::path> player_background_image () const {
-               return _player_background_image;
+       AudioMapping audio_mapping (int output_channels);
+
+       std::vector<dcp::LanguageTag> custom_languages () const {
+               return _custom_languages;
+       }
+
+       boost::optional<boost::filesystem::path> initial_path(std::string id) const;
+
+       bool use_isdcf_name_by_default () const {
+               return _use_isdcf_name_by_default;
        }
 
-       std::string kdm_server_url () const {
-               return _kdm_server_url;
+       bool write_kdms_to_disk () const {
+               return _write_kdms_to_disk;
        }
 
-       std::string player_watermark_theatre () const {
-               return _player_watermark_theatre;
+       bool email_kdms () const {
+               return _email_kdms;
        }
 
-       int player_watermark_period () const {
-               return _player_watermark_period;
+       dcp::Formulation default_kdm_type () const {
+               return _default_kdm_type;
        }
 
-       int player_watermark_duration () const {
-               return _player_watermark_duration;
+       RoughDuration default_kdm_duration () const {
+               return _default_kdm_duration;
        }
 
-       std::vector<Monitor> required_monitors () const {
-               return _required_monitors;
+       double auto_crop_threshold () const {
+               return _auto_crop_threshold;
        }
 
-       boost::optional<boost::filesystem::path> player_lock_file () const {
-               return _player_lock_file;
+       boost::optional<std::string> last_release_notes_version () const {
+               return _last_release_notes_version;
+       }
+
+       boost::optional<int> main_divider_sash_position() const {
+               return _main_divider_sash_position;
+       }
+
+       boost::optional<int> main_content_divider_sash_position() const {
+               return _main_content_divider_sash_position;
+       }
+
+       enum class DefaultAddFileLocation {
+               SAME_AS_LAST_TIME,
+               SAME_AS_PROJECT
+       };
+
+       DefaultAddFileLocation default_add_file_location() const {
+               return _default_add_file_location;
+       }
+
+       bool allow_smpte_bv20() const {
+               return _allow_smpte_bv20;
+       }
+
+       int isdcf_name_part_length() const {
+               return _isdcf_name_part_length;
        }
-#endif
 
        /* SET (mostly) */
 
@@ -557,10 +652,14 @@ public:
                maybe_set (_only_servers_encode, o);
        }
 
-       void set_tms_protocol (Protocol p) {
+       void set_tms_protocol (FileTransferProtocol p) {
                maybe_set (_tms_protocol, p);
        }
 
+       void set_tms_passive(bool passive) {
+               maybe_set(_tms_passive, passive);
+       }
+
        /** @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);
@@ -581,16 +680,26 @@ public:
                maybe_set (_tms_password, p);
        }
 
-       void add_cinema (boost::shared_ptr<Cinema> c) {
+       void add_cinema (std::shared_ptr<Cinema> c) {
                _cinemas.push_back (c);
                changed (CINEMAS);
        }
 
-       void remove_cinema (boost::shared_ptr<Cinema> c) {
+       void remove_cinema (std::shared_ptr<Cinema> c) {
                _cinemas.remove (c);
                changed (CINEMAS);
        }
 
+       void add_dkdm_recipient (std::shared_ptr<DKDMRecipient> c) {
+               _dkdm_recipients.push_back (c);
+               changed (DKDM_RECIPIENTS);
+       }
+
+       void remove_dkdm_recipient (std::shared_ptr<DKDMRecipient> c) {
+               _dkdm_recipients.remove (c);
+               changed (DKDM_RECIPIENTS);
+       }
+
        void set_allowed_dcp_frame_rates (std::list<int> const & r) {
                maybe_set (_allowed_dcp_frame_rates, r);
        }
@@ -603,8 +712,16 @@ public:
                maybe_set (_allow_any_container, a);
        }
 
-       void set_default_isdcf_metadata (ISDCFMetadata d) {
-               maybe_set (_default_isdcf_metadata, d);
+       void set_allow_96hhz_audio (bool a) {
+               maybe_set (_allow_96khz_audio, a);
+       }
+
+       void set_use_all_audio_channels (bool a) {
+               maybe_set (_use_all_audio_channels, a);
+       }
+
+       void set_show_experimental_audio_processors (bool e) {
+               maybe_set (_show_experimental_audio_processors, e, SHOW_EXPERIMENTAL_AUDIO_PROCESSORS);
        }
 
        void set_language (std::string l) {
@@ -628,14 +745,6 @@ public:
                maybe_set (_default_still_length, s);
        }
 
-       void set_default_container (Ratio const * c) {
-               maybe_set (_default_container, c);
-       }
-
-       void set_default_scale_to (Ratio const * c) {
-               maybe_set (_default_scale_to, c);
-       }
-
        void set_default_dcp_content_type (DCPContentType const * t) {
                maybe_set (_default_dcp_content_type, t);
        }
@@ -652,6 +761,22 @@ public:
                maybe_set (_dcp_creator, c);
        }
 
+       void set_dcp_company_name (std::string c) {
+               maybe_set (_dcp_company_name, c);
+       }
+
+       void set_dcp_product_name (std::string c) {
+               maybe_set (_dcp_product_name, c);
+       }
+
+       void set_dcp_product_version (std::string c) {
+               maybe_set (_dcp_product_version, c);
+       }
+
+       void set_dcp_j2k_comment (std::string c) {
+               maybe_set (_dcp_j2k_comment, c);
+       }
+
        void set_default_j2k_bandwidth (int b) {
                maybe_set (_default_j2k_bandwidth, b);
        }
@@ -664,8 +789,28 @@ public:
                maybe_set (_default_interop, i);
        }
 
-       void set_default_upload_after_make_dcp (bool u) {
-               maybe_set (_default_upload_after_make_dcp, u);
+       void set_default_audio_language(dcp::LanguageTag tag) {
+               maybe_set(_default_audio_language, tag);
+       }
+
+       void unset_default_audio_language() {
+               maybe_set(_default_audio_language, boost::optional<dcp::LanguageTag>());
+       }
+
+       void set_default_territory(dcp::LanguageTag::RegionSubtag tag) {
+               maybe_set(_default_territory, tag);
+       }
+
+       void unset_default_territory() {
+               maybe_set(_default_territory, boost::optional<dcp::LanguageTag::RegionSubtag>());
+       }
+
+       void set_default_metadata (std::map<std::string, std::string> const& metadata) {
+               maybe_set (_default_metadata, metadata);
+       }
+
+       void set_upload_after_make_dcp (bool u) {
+               maybe_set (_upload_after_make_dcp, u);
        }
 
        void set_mail_server (std::string s) {
@@ -676,6 +821,10 @@ public:
                maybe_set (_mail_port, p);
        }
 
+       void set_mail_protocol (EmailProtocol p) {
+               maybe_set (_mail_protocol, p);
+       }
+
        void set_mail_user (std::string u) {
                maybe_set (_mail_user, u);
        }
@@ -732,11 +881,11 @@ public:
 
        void reset_notification_email ();
 
-       void set_signer_chain (boost::shared_ptr<const dcp::CertificateChain> s) {
+       void set_signer_chain (std::shared_ptr<const dcp::CertificateChain> s) {
                maybe_set (_signer_chain, s);
        }
 
-       void set_decryption_chain (boost::shared_ptr<const dcp::CertificateChain> c) {
+       void set_decryption_chain (std::shared_ptr<const dcp::CertificateChain> c) {
                maybe_set (_decryption_chain, c);
        }
 
@@ -773,7 +922,7 @@ public:
        }
 #endif
 
-       void set_dkdms (boost::shared_ptr<DKDMGroup> dkdms) {
+       void set_dkdms (std::shared_ptr<DKDMGroup> dkdms) {
                _dkdms = dkdms;
                changed ();
        }
@@ -825,6 +974,10 @@ public:
                maybe_set (_kdm_filename_format, n);
        }
 
+       void set_dkdm_filename_format (dcp::NameFormat n) {
+               maybe_set (_dkdm_filename_format, n);
+       }
+
        void set_dcp_metadata_filename_format (dcp::NameFormat n) {
                maybe_set (_dcp_metadata_filename_format, n);
        }
@@ -856,7 +1009,9 @@ public:
        }
 
        void add_to_history (boost::filesystem::path p);
+       void clean_history ();
        void add_to_player_history (boost::filesystem::path p);
+       void clean_player_history ();
 
        void set_jump_to_selected (bool j) {
                maybe_set (_jump_to_selected, j);
@@ -924,10 +1079,6 @@ public:
                maybe_set (_gdc_password, boost::optional<std::string>());
        }
 
-       void set_interface_complexity (Interface i) {
-               maybe_set (_interface_complexity, i, INTERFACE_COMPLEXITY);
-       }
-
        void set_player_mode (PlayerMode m) {
                maybe_set (_player_mode, m);
        }
@@ -936,20 +1087,24 @@ public:
                maybe_set (_image_display, n);
        }
 
+       void set_video_view_type (VideoViewType v) {
+               maybe_set (_video_view_type, v);
+       }
+
        void set_respect_kdm_validity_periods (bool r) {
                maybe_set (_respect_kdm_validity_periods, r);
        }
 
-       void set_player_log_file (boost::filesystem::path p) {
-               maybe_set (_player_log_file, p);
+       void set_player_debug_log_file (boost::filesystem::path p) {
+               maybe_set (_player_debug_log_file, p, PLAYER_DEBUG_LOG);
        }
 
-       void unset_player_log_file () {
-               if (!_player_log_file) {
+       void unset_player_debug_log_file () {
+               if (!_player_debug_log_file) {
                        return;
                }
-               _player_log_file = boost::none;
-               changed ();
+               _player_debug_log_file = boost::none;
+               changed (PLAYER_DEBUG_LOG);
        }
 
        void set_player_content_directory (boost::filesystem::path p) {
@@ -988,101 +1143,119 @@ public:
                changed ();
        }
 
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-       void set_player_background_image (boost::filesystem::path p) {
-               maybe_set (_player_background_image, p, PLAYER_BACKGROUND_IMAGE);
+       void set_audio_mapping (AudioMapping m);
+       void set_audio_mapping_to_default ();
+
+       void add_custom_language (dcp::LanguageTag tag);
+
+       void set_initial_path(std::string id, boost::filesystem::path path);
+
+       void set_use_isdcf_name_by_default (bool use) {
+               maybe_set (_use_isdcf_name_by_default, use);
        }
 
-       void unset_player_background_image () {
-               if (!_player_background_image) {
-                       return;
-               }
-               _player_background_image = boost::none;
-               changed (PLAYER_BACKGROUND_IMAGE);
+       void set_write_kdms_to_disk (bool write) {
+               maybe_set (_write_kdms_to_disk, write);
        }
 
-       void set_kdm_server_url (std::string s) {
-               maybe_set (_kdm_server_url, s);
+       void set_email_kdms (bool email) {
+               maybe_set (_email_kdms, email);
        }
 
-       void set_player_watermark_theatre (std::string p) {
-               maybe_set (_player_watermark_theatre, p);
+       void set_default_kdm_type (dcp::Formulation type) {
+               maybe_set (_default_kdm_type, type);
        }
 
-       void set_player_watermark_period (int minutes) {
-               maybe_set (_player_watermark_period, minutes);
+       void set_default_kdm_duration (RoughDuration duration) {
+               maybe_set (_default_kdm_duration, duration);
        }
 
-       void set_player_watermark_duration (int milliseconds) {
-               maybe_set (_player_watermark_duration, milliseconds);
+       void set_auto_crop_threshold (double threshold) {
+               maybe_set (_auto_crop_threshold, threshold, AUTO_CROP_THRESHOLD);
        }
 
-       void set_required_monitors (std::vector<Monitor> monitors) {
-               maybe_set (_required_monitors, monitors);
+       void set_last_release_notes_version (std::string version) {
+               maybe_set (_last_release_notes_version, version);
        }
 
-       void set_player_lock_file (boost::filesystem::path p) {
-               maybe_set (_player_lock_file, p);
+       void unset_last_release_notes_version() {
+               maybe_set(_last_release_notes_version, boost::optional<std::string>());
        }
 
-       void unset_player_lock_file () {
-               if (!_player_lock_file) {
-                       return;
-               }
-               _player_lock_file = boost::none;
-               changed ();
+       ExportConfig& export_config() {
+               return _export;
+       }
+
+       void set_main_divider_sash_position(int position) {
+               maybe_set(_main_divider_sash_position, position);
+       }
+
+       void set_main_content_divider_sash_position(int position) {
+               maybe_set(_main_content_divider_sash_position, position);
+       }
+
+       void set_default_add_file_location(DefaultAddFileLocation location) {
+               maybe_set(_default_add_file_location, location);
+       }
+
+       void set_allow_smpte_bv20(bool allow) {
+               maybe_set(_allow_smpte_bv20, allow, ALLOW_SMPTE_BV20);
+       }
+
+       void set_isdcf_name_part_length(int length) {
+               maybe_set(_isdcf_name_part_length, length, ISDCF_NAME_PART_LENGTH);
        }
-#endif
 
        void changed (Property p = OTHER);
        boost::signals2::signal<void (Property)> Changed;
        /** Emitted if read() failed on an existing Config file.  There is nothing
            a listener can do about it: this is just for information.
        */
-       static boost::signals2::signal<void ()> FailedToLoad;
+       enum class LoadFailure {
+               CONFIG,
+               CINEMAS,
+               DKDM_RECIPIENTS
+       };
+       static boost::signals2::signal<void (LoadFailure)> FailedToLoad;
        /** Emitted if read() issued a warning which the user might want to know about */
        static boost::signals2::signal<void (std::string)> Warning;
-       /** Emitted if there is a bad certificate in the signer chain.  Handler can call
-        *  true to ask Config to re-create the chain.
+       /** Emitted if there is a something wrong the contents of our config.  Handler can call
+        *  true to ask Config to solve the problem (by discarding and recreating the bad thing)
         */
-       static boost::signals2::signal<bool (void)> BadSignerChain;
+       enum BadReason {
+               BAD_SIGNER_UTF8_STRINGS,      ///< signer chain contains UTF-8 strings (not PRINTABLESTRING)
+               BAD_SIGNER_INCONSISTENT,      ///< signer chain is somehow inconsistent
+               BAD_DECRYPTION_INCONSISTENT,  ///< KDM decryption chain is somehow inconsistent
+               BAD_SIGNER_VALIDITY_TOO_LONG, ///< signer certificate validity periods are >10 years
+               BAD_SIGNER_DN_QUALIFIER,      ///< some signer certificate has a bad dnQualifier (DoM #2716).
+       };
+
+       static boost::signals2::signal<bool (BadReason)> Bad;
 
-       void write () const;
+       void write () const override;
        void write_config () const;
        void write_cinemas () const;
+       void write_dkdm_recipients () const;
        void link (boost::filesystem::path new_file) const;
        void copy_and_link (boost::filesystem::path new_file) const;
        bool have_write_permission () const;
 
-       void save_template (boost::shared_ptr<const Film> film, std::string name) const;
+       void save_template (std::shared_ptr<const Film> film, std::string name) const;
        bool existing_template (std::string name) const;
        std::list<std::string> templates () const;
-       boost::filesystem::path template_path (std::string name) const;
+       boost::filesystem::path template_read_path (std::string name) const;
+       boost::filesystem::path template_write_path (std::string name) const;
        void rename_template (std::string old_name, std::string new_name) const;
        void delete_template (std::string name) const;
 
+       boost::optional<BadReason> check_certificates () const;
+
        static Config* instance ();
        static void drop ();
        static void restore_defaults ();
        static bool have_existing (std::string);
-       static boost::filesystem::path config_file ();
-       static boost::filesystem::path path (std::string file, bool create_directories = true);
-
-       /** If set, this overrides the standard path (in home, Library, AppData or wherever) for config.xml and cinemas.xml */
-       static boost::optional<boost::filesystem::path> override_path;
-
-private:
-       Config ();
-       void read ();
-       void set_defaults ();
-       void set_kdm_email_to_default ();
-       void set_notification_email_to_default ();
-       void set_cover_sheet_to_default ();
-       void read_cinemas (cxml::Document const & f);
-       boost::shared_ptr<dcp::CertificateChain> create_certificate_chain ();
-       boost::filesystem::path directory_or (boost::optional<boost::filesystem::path> dir, boost::filesystem::path a) const;
-       void add_to_history_internal (std::vector<boost::filesystem::path>& h, boost::filesystem::path p);
-       void backup ();
+       static boost::filesystem::path config_read_file ();
+       static boost::filesystem::path config_write_file ();
 
        template <class T>
        void maybe_set (T& member, T new_value, Property prop = OTHER) {
@@ -1102,6 +1275,24 @@ private:
                changed (prop);
        }
 
+private:
+       Config ();
+       void read () override;
+       void read_config();
+       void read_cinemas();
+       void read_dkdm_recipients();
+       void set_defaults ();
+       void set_kdm_email_to_default ();
+       void set_notification_email_to_default ();
+       void set_cover_sheet_to_default ();
+       void read_cinemas (cxml::Document const & f);
+       void read_dkdm_recipients (cxml::Document const & f);
+       std::shared_ptr<dcp::CertificateChain> create_certificate_chain ();
+       boost::filesystem::path directory_or (boost::optional<boost::filesystem::path> dir, boost::filesystem::path a) const;
+       void add_to_history_internal (std::vector<boost::filesystem::path>& h, boost::filesystem::path p);
+       void clean_history_internal (std::vector<boost::filesystem::path>& h);
+       void backup ();
+
        /** number of threads which a master DoM should use for J2K encoding on the local machine */
        int _master_encoding_threads;
        /** number of threads which a server should use for J2K encoding on the local machine */
@@ -1117,7 +1308,8 @@ private:
        /** J2K encoding servers that should definitely be used */
        std::vector<std::string> _servers;
        bool _only_servers_encode;
-       Protocol _tms_protocol;
+       FileTransferProtocol _tms_protocol;
+       bool _tms_passive;
        /** 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 */
@@ -1126,8 +1318,6 @@ private:
        std::string _tms_user;
        /** Password to log into the TMS with */
        std::string _tms_password;
-       /** Our cinema sound processor */
-       CinemaSoundProcessor const * _cinema_sound_processor;
        /** The list of possible DCP frame rates that DCP-o-matic will use */
        std::list<int> _allowed_dcp_frame_rates;
        /** Allow any video frame rate for the DCP; if true, overrides _allowed_dcp_frame_rates */
@@ -1137,28 +1327,37 @@ private:
            https://www.dcpomatic.com/forum/viewtopic.php?f=2&t=1119&p=4468
        */
        bool _allow_any_container;
-       /** Default ISDCF metadata for newly-created Films */
-       ISDCFMetadata _default_isdcf_metadata;
+       bool _allow_96khz_audio;
+       bool _use_all_audio_channels;
+       /** Offer the upmixers in the audio processor settings */
+       bool _show_experimental_audio_processors;
        boost::optional<std::string> _language;
        /** Default length of still image content (seconds) */
        int _default_still_length;
-       Ratio const * _default_container;
-       Ratio const * _default_scale_to;
        DCPContentType const * _default_dcp_content_type;
        int _default_dcp_audio_channels;
        std::string _dcp_issuer;
        std::string _dcp_creator;
+       std::string _dcp_company_name;
+       std::string _dcp_product_name;
+       std::string _dcp_product_version;
+       std::string _dcp_j2k_comment;
        int _default_j2k_bandwidth;
        int _default_audio_delay;
        bool _default_interop;
+       boost::optional<dcp::LanguageTag> _default_audio_language;
+       boost::optional<dcp::LanguageTag::RegionSubtag> _default_territory;
+       std::map<std::string, std::string> _default_metadata;
        /** Default directory to offer to write KDMs to; if it's not set,
            the home directory will be offered.
        */
        boost::optional<boost::filesystem::path> _default_kdm_directory;
-       bool _default_upload_after_make_dcp;
-       std::list<boost::shared_ptr<Cinema> > _cinemas;
+       bool _upload_after_make_dcp;
+       std::list<std::shared_ptr<Cinema>> _cinemas;
+       std::list<std::shared_ptr<DKDMRecipient>> _dkdm_recipients;
        std::string _mail_server;
        int _mail_port;
+       EmailProtocol _mail_protocol;
        std::string _mail_user;
        std::string _mail_password;
        std::string _kdm_subject;
@@ -1172,17 +1371,11 @@ private:
        std::vector<std::string> _notification_cc;
        std::string _notification_bcc;
        std::string _notification_email;
-       boost::shared_ptr<const dcp::CertificateChain> _signer_chain;
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-       boost::filesystem::path _signer_chain_path;
-#endif
+       std::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;
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-       boost::filesystem::path _decryption_chain_path;
-#endif
+       std::shared_ptr<const dcp::CertificateChain> _decryption_chain;
        /** true to check for updates on startup */
        bool _check_for_updates;
        bool _check_for_test_updates;
@@ -1196,11 +1389,13 @@ private:
 #endif
        std::vector<boost::filesystem::path> _history;
        std::vector<boost::filesystem::path> _player_history;
-       boost::shared_ptr<DKDMGroup> _dkdms;
+       std::shared_ptr<DKDMGroup> _dkdms;
        boost::filesystem::path _cinemas_file;
+       boost::filesystem::path _dkdm_recipients_file;
        bool _show_hints_before_make_dcp;
        bool _confirm_kdm_email;
        dcp::NameFormat _kdm_filename_format;
+       dcp::NameFormat _dkdm_filename_format;
        dcp::NameFormat _kdm_container_name_format;
        dcp::NameFormat _dcp_metadata_filename_format;
        dcp::NameFormat _dcp_asset_filename_format;
@@ -1223,11 +1418,12 @@ private:
        boost::optional<std::string> _christie_password;
        boost::optional<std::string> _gdc_username;
        boost::optional<std::string> _gdc_password;
-       Interface _interface_complexity;
        PlayerMode _player_mode;
        int _image_display;
+       VideoViewType _video_view_type;
        bool _respect_kdm_validity_periods;
-       boost::optional<boost::filesystem::path> _player_log_file;
+       /** Log file containing debug information for the player */
+       boost::optional<boost::filesystem::path> _player_debug_log_file;
        /** A directory containing DCPs whose contents are presented to the user
            in the dual-screen player mode.  DCPs on the list can be loaded
            for playback.
@@ -1235,18 +1431,23 @@ private:
        boost::optional<boost::filesystem::path> _player_content_directory;
        boost::optional<boost::filesystem::path> _player_playlist_directory;
        boost::optional<boost::filesystem::path> _player_kdm_directory;
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-       boost::optional<boost::filesystem::path> _player_background_image;
-       std::string _kdm_server_url;
-       std::string _player_watermark_theatre;
-       /** watermark period in minutes */
-       int _player_watermark_period;
-       /** watermark duration in milliseconds */
-       int _player_watermark_duration;
-       std::vector<Monitor> _required_monitors;
-       /** a file which, if specified, must be present for the player to work */
-       boost::optional<boost::filesystem::path> _player_lock_file;
-#endif
+       boost::optional<AudioMapping> _audio_mapping;
+       std::vector<dcp::LanguageTag> _custom_languages;
+       std::map<std::string, boost::optional<boost::filesystem::path>> _initial_paths;
+       bool _use_isdcf_name_by_default;
+       bool _write_kdms_to_disk;
+       bool _email_kdms;
+       dcp::Formulation _default_kdm_type;
+       RoughDuration _default_kdm_duration;
+       double _auto_crop_threshold;
+       boost::optional<std::string> _last_release_notes_version;
+       boost::optional<int> _main_divider_sash_position;
+       boost::optional<int> _main_content_divider_sash_position;
+       DefaultAddFileLocation _default_add_file_location;
+       bool _allow_smpte_bv20;
+       int _isdcf_name_part_length;
+
+       ExportConfig _export;
 
        static int const _current_version;
 
@@ -1254,4 +1455,5 @@ private:
        static Config* _instance;
 };
 
+
 #endif