X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=dae1924a86c50ea1948e65878f2cf1432a19d511;hb=f706bbb9afd10472e81a051cd5db601d6404377c;hp=55a172d78df40ed7c62025ff60c5422c7e9406fc;hpb=b56bc3c45953fe113a9934b0d2ec2c1134de07ab;p=dcpomatic.git

diff --git a/src/lib/config.h b/src/lib/config.h
index 55a172d78..9727bac1a 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2022 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -21,45 +22,80 @@
  *  @brief Class holding configuration.
  */
 
+
 #ifndef DCPOMATIC_CONFIG_H
 #define DCPOMATIC_CONFIG_H
 
-#include <vector>
-#include <boost/shared_ptr.hpp>
+
+#include "audio_mapping.h"
+#include "export_config.h"
+#include "rough_duration.h"
+#include "state.h"
+#include "types.h"
+#include <dcp/name_format.h>
+#include <dcp/certificate_chain.h>
+#include <dcp/encrypted_kdm.h>
+#include <dcp/language_tag.h>
 #include <boost/signals2.hpp>
 #include <boost/filesystem.hpp>
-#include <dcp/metadata.h>
-#include <dcp/certificates.h>
-#include <dcp/signer.h>
-#include "isdcf_metadata.h"
-#include "colour_conversion.h"
-#include "video_content.h"
-
-class ServerDescription;
-class Scaler;
-class Filter;
+#include <vector>
+
+
+class Cinema;
 class CinemaSoundProcessor;
 class DCPContentType;
+class DKDMGroup;
+class DKDMRecipient;
+class Film;
 class Ratio;
-class Cinema;
+
+
+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 */
+	int master_encoding_threads () const {
+		return _master_encoding_threads;
+	}
 
-	/** @return number of threads to use for J2K encoding on the local machine */
-	int num_local_encoding_threads () const {
-		return _num_local_encoding_threads;
+	/** @return number of threads which a server should use for J2K encoding on the local machine */
+	int server_encoding_threads () const {
+		return _server_encoding_threads;
 	}
 
-	boost::filesystem::path default_directory () const {
+	boost::optional<boost::filesystem::path> default_directory () const {
 		return _default_directory;
 	}
 
+	boost::optional<boost::filesystem::path> default_kdm_directory () const {
+		return _default_kdm_directory;
+	}
+
 	boost::filesystem::path default_directory_or (boost::filesystem::path a) const;
+	boost::filesystem::path default_kdm_directory_or (boost::filesystem::path a) const;
+
+	enum Property {
+		USE_ANY_SERVERS,
+		SERVERS,
+		CINEMAS,
+		DKDM_RECIPIENTS,
+		SOUND,
+		SOUND_OUTPUT,
+		PLAYER_CONTENT_DIRECTORY,
+		PLAYER_PLAYLIST_DIRECTORY,
+		PLAYER_DEBUG_LOG,
+		HISTORY,
+		SHOW_EXPERIMENTAL_AUDIO_PROCESSORS,
+		AUDIO_MAPPING,
+		AUTO_CROP_THRESHOLD,
+		OTHER
+	};
 
 	/** @return base port number to use for J2K encoding servers */
 	int server_port_base () const {
@@ -68,7 +104,7 @@ public:
 
 	void set_use_any_servers (bool u) {
 		_use_any_servers = u;
-		changed ();
+		changed (USE_ANY_SERVERS);
 	}
 
 	bool use_any_servers () const {
@@ -78,7 +114,7 @@ public:
 	/** @param s New list of servers */
 	void set_servers (std::vector<std::string> s) {
 		_servers = s;
-		changed ();
+		changed (SERVERS);
 	}
 
 	/** @return Host names / IP addresses of J2K encoding servers that should definitely be used */
@@ -86,11 +122,19 @@ public:
 		return _servers;
 	}
 
+	bool only_servers_encode () const {
+		return _only_servers_encode;
+	}
+
+	FileTransferProtocol tms_protocol () const {
+		return _tms_protocol;
+	}
+
 	/** @return The IP address of a TMS that we can copy DCPs to */
 	std::string tms_ip () const {
 		return _tms_ip;
 	}
-	
+
 	/** @return The path on a TMS that we should changed DCPs to */
 	std::string tms_path () const {
 		return _tms_path;
@@ -106,15 +150,14 @@ 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 {
 		return _allowed_dcp_frame_rates;
 	}
@@ -122,9 +165,21 @@ public:
 	bool allow_any_dcp_frame_rate () const {
 		return _allow_any_dcp_frame_rate;
 	}
-	
-	ISDCFMetadata default_isdcf_metadata () const {
-		return _default_isdcf_metadata;
+
+	bool allow_any_container () const {
+		return _allow_any_container;
+	}
+
+	bool allow_96khz_audio () const {
+		return _allow_96khz_audio;
+	}
+
+	bool use_all_audio_channels () const {
+		return _use_all_audio_channels;
+	}
+
+	bool show_experimental_audio_processors () const {
+		return _show_experimental_audio_processors;
 	}
 
 	boost::optional<std::string> language () const {
@@ -135,10 +190,6 @@ public:
 		return _default_still_length;
 	}
 
-	VideoContentScale default_scale () const {
-		return _default_scale;
-	}
-
 	Ratio const * default_container () const {
 		return _default_container;
 	}
@@ -147,10 +198,34 @@ public:
 		return _default_dcp_content_type;
 	}
 
+	int default_dcp_audio_channels () const {
+		return _default_dcp_audio_channels;
+	}
+
 	std::string dcp_issuer () const {
 		return _dcp_issuer;
 	}
 
+	std::string dcp_creator () const {
+		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;
 	}
@@ -159,14 +234,38 @@ public:
 		return _default_audio_delay;
 	}
 
-	std::vector<PresetColourConversion> colour_conversions () const {
-		return _colour_conversions;
+	bool default_interop () const {
+		return _default_interop;
+	}
+
+	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) {
+		if (_default_kdm_directory && _default_kdm_directory.get() == d) {
+			return;
+		}
+		_default_kdm_directory = d;
+		changed ();
 	}
 
 	std::string mail_server () const {
 		return _mail_server;
 	}
 
+	int mail_port () const {
+		return _mail_port;
+	}
+
+	EmailProtocol mail_protocol () const {
+		return _mail_protocol;
+	}
+
 	std::string mail_user () const {
 		return _mail_user;
 	}
@@ -183,28 +282,48 @@ public:
 		return _kdm_from;
 	}
 
-	std::string kdm_cc () const {
+	std::vector<std::string> kdm_cc () const {
 		return _kdm_cc;
 	}
 
 	std::string kdm_bcc () const {
 		return _kdm_bcc;
 	}
-	
+
 	std::string kdm_email () const {
 		return _kdm_email;
 	}
 
-	boost::shared_ptr<const dcp::Signer> signer () const {
-		return _signer;
+	std::string notification_subject () const {
+		return _notification_subject;
+	}
+
+	std::string notification_from () const {
+		return _notification_from;
 	}
 
-	dcp::Certificate decryption_certificate () const {
-		return _decryption_certificate;
+	std::string notification_to () const {
+		return _notification_to;
 	}
 
-	std::string decryption_private_key () const {
-		return _decryption_private_key;
+	std::vector<std::string> notification_cc () const {
+		return _notification_cc;
+	}
+
+	std::string notification_bcc () const {
+		return _notification_bcc;
+	}
+
+	std::string notification_email () const {
+		return _notification_email;
+	}
+
+	std::shared_ptr<const dcp::CertificateChain> signer_chain () const {
+		return _signer_chain;
+	}
+
+	std::shared_ptr<const dcp::CertificateChain> decryption_chain () const {
+		return _decryption_chain;
 	}
 
 	bool check_for_updates () const {
@@ -223,248 +342,892 @@ public:
 		return _log_types;
 	}
 
-#ifdef DCPOMATIC_WINDOWS	
+	bool analyse_ebur128 () const {
+		return _analyse_ebur128;
+	}
+
+	bool automatic_audio_analysis () const {
+		return _automatic_audio_analysis;
+	}
+
+#ifdef DCPOMATIC_WINDOWS
 	bool win32_console () const {
 		return _win32_console;
 	}
-#endif	
+#endif
 
 	std::vector<boost::filesystem::path> history () const {
 		return _history;
 	}
 
-	/** @param n New number of local encoding threads */
-	void set_num_local_encoding_threads (int n) {
-		_num_local_encoding_threads = n;
-		changed ();
+	std::vector<boost::filesystem::path> player_history () const {
+		return _player_history;
+	}
+
+	std::shared_ptr<DKDMGroup> dkdms () const {
+		return _dkdms;
+	}
+
+	boost::filesystem::path cinemas_file () const {
+		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;
+	}
+
+	bool confirm_kdm_email () const {
+		return _confirm_kdm_email;
+	}
+
+	dcp::NameFormat kdm_container_name_format () const {
+		return _kdm_container_name_format;
+	}
+
+	dcp::NameFormat kdm_filename_format () const {
+		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;
+	}
+
+	dcp::NameFormat dcp_asset_filename_format () const {
+		return _dcp_asset_filename_format;
+	}
+
+	bool jump_to_selected () const {
+		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_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_COUNT
+	};
+
+	bool nagged (Nag nag) const {
+		return _nagged[nag];
+	}
+
+	bool sound () const {
+		return _sound;
+	}
+
+	std::string cover_sheet () const {
+		return _cover_sheet;
+	}
+
+	boost::optional<std::string> sound_output () const {
+		return _sound_output;
+	}
+
+	boost::optional<boost::filesystem::path> last_player_load_directory () const {
+		return _last_player_load_directory;
+	}
+
+	enum KDMWriteType {
+		KDM_WRITE_FLAT,
+		KDM_WRITE_FOLDER,
+		KDM_WRITE_ZIP
+	};
+
+	boost::optional<KDMWriteType> last_kdm_write_type () const {
+		return _last_kdm_write_type;
+	}
+
+	enum DKDMWriteType {
+		DKDM_WRITE_INTERNAL,
+		DKDM_WRITE_FILE
+	};
+
+	boost::optional<DKDMWriteType> last_dkdm_write_type () const {
+		return _last_dkdm_write_type;
+	}
+
+	int frames_in_memory_multiplier () const {
+		return _frames_in_memory_multiplier;
+	}
+
+	boost::optional<int> decode_reduction () const {
+		return _decode_reduction;
+	}
+
+	bool default_notify () const {
+		return _default_notify;
+	}
+
+	enum Notification {
+		MESSAGE_BOX,
+		EMAIL,
+		NOTIFICATION_COUNT
+	};
+
+	bool notification (Notification n) const {
+		return _notification[n];
+	}
+
+	boost::optional<std::string> barco_username () const {
+		return _barco_username;
+	}
+
+	boost::optional<std::string> barco_password () const {
+		return _barco_password;
+	}
+
+	boost::optional<std::string> christie_username () const {
+		return _christie_username;
+	}
+
+	boost::optional<std::string> christie_password () const {
+		return _christie_password;
+	}
+
+	boost::optional<std::string> gdc_username () const {
+		return _gdc_username;
+	}
+
+	boost::optional<std::string> gdc_password () const {
+		return _gdc_password;
+	}
+
+	enum PlayerMode {
+		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 {
+		return _player_mode;
+	}
+
+	int image_display () const {
+		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_debug_log_file () const {
+		return _player_debug_log_file;
+	}
+
+	boost::optional<boost::filesystem::path> player_content_directory () const {
+		return _player_content_directory;
+	}
+
+	boost::optional<boost::filesystem::path> player_playlist_directory () const {
+		return _player_playlist_directory;
+	}
+
+	boost::optional<boost::filesystem::path> player_kdm_directory () const {
+		return _player_kdm_directory;
+	}
+
+	AudioMapping audio_mapping (int output_channels);
+
+	std::vector<dcp::LanguageTag> custom_languages () const {
+		return _custom_languages;
+	}
+
+	boost::optional<boost::filesystem::path> add_files_path () const {
+		return _add_files_path;
+	}
+
+	bool use_isdcf_name_by_default () const {
+		return _use_isdcf_name_by_default;
+	}
+
+	bool write_kdms_to_disk () const {
+		return _write_kdms_to_disk;
+	}
+
+	bool email_kdms () const {
+		return _email_kdms;
+	}
+
+	dcp::Formulation default_kdm_type () const {
+		return _default_kdm_type;
+	}
+
+	RoughDuration default_kdm_duration () const {
+		return _default_kdm_duration;
+	}
+
+	double auto_crop_threshold () const {
+		return _auto_crop_threshold;
+	}
+
+	boost::optional<std::string> last_release_notes_version () const {
+		return _last_release_notes_version;
+	}
+
+	/* SET (mostly) */
+
+	void set_master_encoding_threads (int n) {
+		maybe_set (_master_encoding_threads, n);
+	}
+
+	void set_server_encoding_threads (int n) {
+		maybe_set (_server_encoding_threads, n);
 	}
 
 	void set_default_directory (boost::filesystem::path d) {
+		if (_default_directory && *_default_directory == d) {
+			return;
+		}
 		_default_directory = d;
 		changed ();
 	}
 
 	/** @param p New server port */
 	void set_server_port_base (int p) {
-		_server_port_base = p;
-		changed ();
+		maybe_set (_server_port_base, p);
+	}
+
+	void set_only_servers_encode (bool o) {
+		maybe_set (_only_servers_encode, o);
+	}
+
+	void set_tms_protocol (FileTransferProtocol p) {
+		maybe_set (_tms_protocol, p);
 	}
 
 	/** @param i IP address of a TMS that we can copy DCPs to */
 	void set_tms_ip (std::string i) {
-		_tms_ip = i;
-		changed ();
+		maybe_set (_tms_ip, i);
 	}
 
 	/** @param p Path on a TMS that we should changed DCPs to */
 	void set_tms_path (std::string p) {
-		_tms_path = p;
-		changed ();
+		maybe_set (_tms_path, p);
 	}
 
 	/** @param u User name to log into the TMS with */
 	void set_tms_user (std::string u) {
-		_tms_user = u;
-		changed ();
+		maybe_set (_tms_user, u);
 	}
 
 	/** @param p Password to log into the TMS with */
 	void set_tms_password (std::string p) {
-		_tms_password = p;
-		changed ();
+		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 ();
+		changed (CINEMAS);
 	}
 
-	void remove_cinema (boost::shared_ptr<Cinema> c) {
+	void remove_cinema (std::shared_ptr<Cinema> c) {
 		_cinemas.remove (c);
-		changed ();
+		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) {
-		_allowed_dcp_frame_rates = r;
-		changed ();
+		maybe_set (_allowed_dcp_frame_rates, r);
 	}
 
 	void set_allow_any_dcp_frame_rate (bool a) {
-		_allow_any_dcp_frame_rate = a;
-		changed ();
+		maybe_set (_allow_any_dcp_frame_rate, a);
 	}
 
-	void set_default_isdcf_metadata (ISDCFMetadata d) {
-		_default_isdcf_metadata = d;
-		changed ();
+	void set_allow_any_container (bool a) {
+		maybe_set (_allow_any_container, a);
+	}
+
+	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) {
+		if (_language && _language.get() == l) {
+			return;
+		}
 		_language = l;
 		changed ();
 	}
 
 	void unset_language () {
+		if (!_language) {
+			return;
+		}
+
 		_language = boost::none;
 		changed ();
 	}
 
 	void set_default_still_length (int s) {
-		_default_still_length = s;
-		changed ();
-	}
-
-	void set_default_scale (VideoContentScale s) {
-		_default_scale = s;
-		changed ();
+		maybe_set (_default_still_length, s);
 	}
 
 	void set_default_container (Ratio const * c) {
-		_default_container = c;
-		changed ();
+		maybe_set (_default_container, c);
 	}
 
 	void set_default_dcp_content_type (DCPContentType const * t) {
-		_default_dcp_content_type = t;
-		changed ();
+		maybe_set (_default_dcp_content_type, t);
+	}
+
+	void set_default_dcp_audio_channels (int c) {
+		maybe_set (_default_dcp_audio_channels, c);
 	}
 
 	void set_dcp_issuer (std::string i) {
-		_dcp_issuer = i;
-		changed ();
+		maybe_set (_dcp_issuer, i);
+	}
+
+	void set_dcp_creator (std::string c) {
+		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) {
-		_default_j2k_bandwidth = b;
-		changed ();
+		maybe_set (_default_j2k_bandwidth, b);
 	}
 
 	void set_default_audio_delay (int d) {
-		_default_audio_delay = d;
-		changed ();
+		maybe_set (_default_audio_delay, d);
 	}
 
-	void set_colour_conversions (std::vector<PresetColourConversion> const & c) {
-		_colour_conversions = c;
-		changed ();
+	void set_default_interop (bool i) {
+		maybe_set (_default_interop, i);
+	}
+
+	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) {
-		_mail_server = s;
-		changed ();
+		maybe_set (_mail_server, s);
+	}
+
+	void set_mail_port (int p) {
+		maybe_set (_mail_port, p);
+	}
+
+	void set_mail_protocol (EmailProtocol p) {
+		maybe_set (_mail_protocol, p);
 	}
 
 	void set_mail_user (std::string u) {
-		_mail_user = u;
-		changed ();
+		maybe_set (_mail_user, u);
 	}
 
 	void set_mail_password (std::string p) {
-		_mail_password = p;
-		changed ();
+		maybe_set (_mail_password, p);
 	}
 
 	void set_kdm_subject (std::string s) {
-		_kdm_subject = s;
-		changed ();
+		maybe_set (_kdm_subject, s);
 	}
 
 	void set_kdm_from (std::string f) {
-		_kdm_from = f;
-		changed ();
+		maybe_set (_kdm_from, f);
 	}
 
-	void set_kdm_cc (std::string f) {
-		_kdm_cc = f;
-		changed ();
+	void set_kdm_cc (std::vector<std::string> f) {
+		maybe_set (_kdm_cc, f);
 	}
 
 	void set_kdm_bcc (std::string f) {
-		_kdm_bcc = f;
-		changed ();
+		maybe_set (_kdm_bcc, f);
 	}
-	
+
 	void set_kdm_email (std::string e) {
-		_kdm_email = e;
-		changed ();
+		maybe_set (_kdm_email, e);
 	}
 
 	void reset_kdm_email ();
 
-	void set_signer (boost::shared_ptr<const dcp::Signer> s) {
-		_signer = s;
-		changed ();
+	void set_notification_subject (std::string s) {
+		maybe_set (_notification_subject, s);
 	}
 
-	void set_decryption_certificate (dcp::Certificate c) {
-		_decryption_certificate = c;
-		changed ();
+	void set_notification_from (std::string f) {
+		maybe_set (_notification_from, f);
 	}
 
-	void set_decryption_private_key (std::string k) {
-		_decryption_private_key = k;
-		changed ();
+	void set_notification_to (std::string t) {
+		maybe_set (_notification_to, t);
+	}
+
+	void set_notification_cc (std::vector<std::string> f) {
+		maybe_set (_notification_cc, f);
+	}
+
+	void set_notification_bcc (std::string f) {
+		maybe_set (_notification_bcc, f);
+	}
+
+	void set_notification_email (std::string e) {
+		maybe_set (_notification_email, e);
+	}
+
+	void reset_notification_email ();
+
+	void set_signer_chain (std::shared_ptr<const dcp::CertificateChain> s) {
+		maybe_set (_signer_chain, s);
+	}
+
+	void set_decryption_chain (std::shared_ptr<const dcp::CertificateChain> c) {
+		maybe_set (_decryption_chain, c);
 	}
 
 	void set_check_for_updates (bool c) {
-		_check_for_updates = c;
-		changed ();
+		maybe_set (_check_for_updates, c);
+		if (!c) {
+			set_check_for_test_updates (false);
+		}
 	}
 
 	void set_check_for_test_updates (bool c) {
-		_check_for_test_updates = c;
-		changed ();
+		maybe_set (_check_for_test_updates, c);
 	}
 
 	void set_maximum_j2k_bandwidth (int b) {
-		_maximum_j2k_bandwidth = b;
-		changed ();
+		maybe_set (_maximum_j2k_bandwidth, b);
 	}
 
 	void set_log_types (int t) {
-		_log_types = t;
-		changed ();
+		maybe_set (_log_types, t);
 	}
 
-#ifdef DCPOMATIC_WINDOWS	
+	void set_analyse_ebur128 (bool a) {
+		maybe_set (_analyse_ebur128, a);
+	}
+
+	void set_automatic_audio_analysis (bool a) {
+		maybe_set (_automatic_audio_analysis, a);
+	}
+
+#ifdef DCPOMATIC_WINDOWS
 	void set_win32_console (bool c) {
-		_win32_console = c;
+		maybe_set (_win32_console, c);
+	}
+#endif
+
+	void set_dkdms (std::shared_ptr<DKDMGroup> dkdms) {
+		_dkdms = dkdms;
 		changed ();
 	}
-#endif	
+
+	void set_cinemas_file (boost::filesystem::path file);
+
+	void set_show_hints_before_make_dcp (bool s) {
+		maybe_set (_show_hints_before_make_dcp, s);
+	}
+
+	void set_confirm_kdm_email (bool s) {
+		maybe_set (_confirm_kdm_email, s);
+	}
+
+	void set_sound (bool s) {
+		maybe_set (_sound, s, SOUND);
+	}
+
+	void set_sound_output (std::string o) {
+		maybe_set (_sound_output, o, SOUND_OUTPUT);
+	}
+
+	void set_last_player_load_directory (boost::filesystem::path d) {
+		maybe_set (_last_player_load_directory, d);
+	}
+
+	void set_last_kdm_write_type (KDMWriteType t) {
+		maybe_set (_last_kdm_write_type, t);
+	}
+
+	void set_last_dkdm_write_type (DKDMWriteType t) {
+		maybe_set (_last_dkdm_write_type, t);
+	}
+
+	void unset_sound_output () {
+		if (!_sound_output) {
+			return;
+		}
+
+		_sound_output = boost::none;
+		changed ();
+	}
+
+	void set_kdm_container_name_format (dcp::NameFormat n) {
+		maybe_set (_kdm_container_name_format, n);
+	}
+
+	void set_kdm_filename_format (dcp::NameFormat n) {
+		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);
+	}
+
+	void set_dcp_asset_filename_format (dcp::NameFormat n) {
+		maybe_set (_dcp_asset_filename_format, n);
+	}
+
+	void set_frames_in_memory_multiplier (int m) {
+		maybe_set (_frames_in_memory_multiplier, m);
+	}
+
+	void set_decode_reduction (boost::optional<int> r) {
+		maybe_set (_decode_reduction, r);
+	}
+
+	void set_default_notify (bool n) {
+		maybe_set (_default_notify, n);
+	}
 
 	void clear_history () {
 		_history.clear ();
 		changed ();
 	}
 
+	void clear_player_history () {
+		_player_history.clear ();
+		changed ();
+	}
+
 	void add_to_history (boost::filesystem::path p);
-	
-	void changed ();
-	boost::signals2::signal<void ()> Changed;
+	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);
+	}
+
+	void set_nagged (Nag nag, bool nagged) {
+		maybe_set (_nagged[nag], nagged);
+	}
+
+	void set_cover_sheet (std::string s) {
+		maybe_set (_cover_sheet, s);
+	}
+
+	void reset_cover_sheet ();
+
+	void set_notification (Notification n, bool v) {
+		maybe_set (_notification[n], v);
+	}
+
+	void set_barco_username (std::string u) {
+		maybe_set (_barco_username, u);
+	}
+
+	void unset_barco_username () {
+		maybe_set (_barco_username, boost::optional<std::string>());
+	}
+
+	void set_barco_password (std::string p) {
+		maybe_set (_barco_password, p);
+	}
+
+	void unset_barco_password () {
+		maybe_set (_barco_password, boost::optional<std::string>());
+	}
+
+	void set_christie_username (std::string u) {
+		maybe_set (_christie_username, u);
+	}
+
+	void unset_christie_username () {
+		maybe_set (_christie_username, boost::optional<std::string>());
+	}
+
+	void set_christie_password (std::string p) {
+		maybe_set (_christie_password, p);
+	}
+
+	void unset_christie_password () {
+		maybe_set (_christie_password, boost::optional<std::string>());
+	}
+
+	void set_gdc_username (std::string u) {
+		maybe_set (_gdc_username, u);
+	}
+
+	void unset_gdc_username () {
+		maybe_set (_gdc_username, boost::optional<std::string>());
+	}
+
+	void set_gdc_password (std::string p) {
+		maybe_set (_gdc_password, p);
+	}
+
+	void unset_gdc_password () {
+		maybe_set (_gdc_password, boost::optional<std::string>());
+	}
+
+	void set_player_mode (PlayerMode m) {
+		maybe_set (_player_mode, m);
+	}
+
+	void set_image_display (int n) {
+		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_debug_log_file (boost::filesystem::path p) {
+		maybe_set (_player_debug_log_file, p, PLAYER_DEBUG_LOG);
+	}
+
+	void unset_player_debug_log_file () {
+		if (!_player_debug_log_file) {
+			return;
+		}
+		_player_debug_log_file = boost::none;
+		changed (PLAYER_DEBUG_LOG);
+	}
+
+	void set_player_content_directory (boost::filesystem::path p) {
+		maybe_set (_player_content_directory, p, PLAYER_CONTENT_DIRECTORY);
+	}
+
+	void unset_player_content_directory () {
+		if (!_player_content_directory) {
+			return;
+		}
+		_player_content_directory = boost::none;
+		changed (PLAYER_CONTENT_DIRECTORY);
+	}
+
+	void set_player_playlist_directory (boost::filesystem::path p) {
+		maybe_set (_player_playlist_directory, p, PLAYER_PLAYLIST_DIRECTORY);
+	}
+
+	void unset_player_playlist_directory () {
+		if (!_player_playlist_directory) {
+			return;
+		}
+		_player_playlist_directory = boost::none;
+		changed (PLAYER_PLAYLIST_DIRECTORY);
+	}
+
+	void set_player_kdm_directory (boost::filesystem::path p) {
+		maybe_set (_player_kdm_directory, p);
+	}
+
+	void unset_player_kdm_directory () {
+		if (!_player_kdm_directory) {
+			return;
+		}
+		_player_kdm_directory = boost::none;
+		changed ();
+	}
+
+	void set_audio_mapping (AudioMapping m);
+	void set_audio_mapping_to_default ();
+
+	void add_custom_language (dcp::LanguageTag tag);
+
+	void set_add_files_path (boost::filesystem::path p) {
+		_add_files_path = p;
+		changed ();
+	}
+
+	void set_use_isdcf_name_by_default (bool use) {
+		maybe_set (_use_isdcf_name_by_default, use);
+	}
+
+	void set_write_kdms_to_disk (bool write) {
+		maybe_set (_write_kdms_to_disk, write);
+	}
+
+	void set_email_kdms (bool email) {
+		maybe_set (_email_kdms, email);
+	}
+
+	void set_default_kdm_type (dcp::Formulation type) {
+		maybe_set (_default_kdm_type, type);
+	}
+
+	void set_default_kdm_duration (RoughDuration duration) {
+		maybe_set (_default_kdm_duration, duration);
+	}
+
+	void set_auto_crop_threshold (double threshold) {
+		maybe_set (_auto_crop_threshold, threshold, AUTO_CROP_THRESHOLD);
+	}
+
+	void set_last_release_notes_version (std::string version) {
+		maybe_set (_last_release_notes_version, version);
+	}
+
+	ExportConfig& export_config() {
+		return _export;
+	}
+
+	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;
+	/** 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 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)
+	 */
+	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
+	};
+
+	static boost::signals2::signal<bool (BadReason)> Bad;
+
+	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 (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_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_read_file ();
+	static boost::filesystem::path config_write_file ();
+
+	template <class T>
+	void maybe_set (T& member, T new_value, Property prop = OTHER) {
+		if (member == new_value) {
+			return;
+		}
+		member = new_value;
+		changed (prop);
+	}
+
+	template <class T>
+	void maybe_set (boost::optional<T>& member, T new_value, Property prop = OTHER) {
+		if (member && member.get() == new_value) {
+			return;
+		}
+		member = new_value;
+		changed (prop);
+	}
 
 private:
 	Config ();
-	boost::filesystem::path file () const;
-	void read ();
-	void write () const;
-	void make_decryption_keys ();
-
-	/** number of threads to use for J2K encoding on the local machine */
-	int _num_local_encoding_threads;
+	void read () override;
+	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 */
+	int _server_encoding_threads;
 	/** default directory to put new films in */
-	boost::filesystem::path _default_directory;
+	boost::optional<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 */
 	bool _use_any_servers;
 	/** J2K encoding servers that should definitely be used */
 	std::vector<std::string> _servers;
+	bool _only_servers_encode;
+	FileTransferProtocol _tms_protocol;
 	/** 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 */
@@ -473,47 +1236,136 @@ 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 */
 	bool _allow_any_dcp_frame_rate;
-	/** Default ISDCF metadata for newly-created Films */
-	ISDCFMetadata _default_isdcf_metadata;
+	/** Allow any container ratio, not just the standard ones.  GDC SX-2001 will not play Flat
+	    DCPs at 25fps but will play 16:9, so this is very useful for some users.
+	    https://www.dcpomatic.com/forum/viewtopic.php?f=2&t=1119&p=4468
+	*/
+	bool _allow_any_container;
+	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;
-	VideoContentScale _default_scale;
 	Ratio const * _default_container;
 	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;
-	std::vector<PresetColourConversion> _colour_conversions;
-	std::list<boost::shared_ptr<Cinema> > _cinemas;
+	bool _default_interop;
+	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 _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;
 	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::Signer> _signer;
-	dcp::Certificate _decryption_certificate;
-	std::string _decryption_private_key;
+	std::string _notification_subject;
+	std::string _notification_from;
+	std::string _notification_to;
+	std::vector<std::string> _notification_cc;
+	std::string _notification_bcc;
+	std::string _notification_email;
+	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.
+	 */
+	std::shared_ptr<const dcp::CertificateChain> _decryption_chain;
 	/** true to check for updates on startup */
 	bool _check_for_updates;
 	bool _check_for_test_updates;
 	/** maximum allowed J2K bandwidth in bits per second */
 	int _maximum_j2k_bandwidth;
 	int _log_types;
-#ifdef DCPOMATIC_WINDOWS	
+	bool _analyse_ebur128;
+	bool _automatic_audio_analysis;
+#ifdef DCPOMATIC_WINDOWS
 	bool _win32_console;
-#endif	
+#endif
 	std::vector<boost::filesystem::path> _history;
-	
+	std::vector<boost::filesystem::path> _player_history;
+	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;
+	bool _jump_to_selected;
+	bool _nagged[NAG_COUNT];
+	bool _sound;
+	/** name of a specific sound output stream to use, or empty to use the default */
+	boost::optional<std::string> _sound_output;
+	std::string _cover_sheet;
+	boost::optional<boost::filesystem::path> _last_player_load_directory;
+	boost::optional<KDMWriteType> _last_kdm_write_type;
+	boost::optional<DKDMWriteType> _last_dkdm_write_type;
+	int _frames_in_memory_multiplier;
+	boost::optional<int> _decode_reduction;
+	bool _default_notify;
+	bool _notification[NOTIFICATION_COUNT];
+	boost::optional<std::string> _barco_username;
+	boost::optional<std::string> _barco_password;
+	boost::optional<std::string> _christie_username;
+	boost::optional<std::string> _christie_password;
+	boost::optional<std::string> _gdc_username;
+	boost::optional<std::string> _gdc_password;
+	PlayerMode _player_mode;
+	int _image_display;
+	VideoViewType _video_view_type;
+	bool _respect_kdm_validity_periods;
+	/** 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.
+	*/
+	boost::optional<boost::filesystem::path> _player_content_directory;
+	boost::optional<boost::filesystem::path> _player_playlist_directory;
+	boost::optional<boost::filesystem::path> _player_kdm_directory;
+	boost::optional<AudioMapping> _audio_mapping;
+	std::vector<dcp::LanguageTag> _custom_languages;
+	boost::optional<boost::filesystem::path> _add_files_path;
+	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;
+
+	ExportConfig _export;
+
+	static int const _current_version;
+
 	/** Singleton instance, or 0 */
 	static Config* _instance;
 };
 
+
 #endif