White space: config.{cc,h} player.{cc,h} about_dialog.{cc,h} hints_dialog.{cc,h}

1 files changed, 369 insertions, 369 deletions

diff --git a/src/lib/config.h b/src/lib/config.h
index 5387f915f..f598ffbc6 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -53,7 +53,7 @@ class Ratio;
 #undef IGNORE
 
 
-extern void save_all_config_as_zip (boost::filesystem::path zip_file);
+extern void save_all_config_as_zip(boost::filesystem::path zip_file);
 
 
 /** @class Config
@@ -63,25 +63,25 @@ 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 {
+	int master_encoding_threads() const {
 		return _master_encoding_threads;
 	}
 
 	/** @return number of threads which a server should use for J2K encoding on the local machine */
-	int server_encoding_threads () const {
+	int server_encoding_threads() const {
 		return _server_encoding_threads;
 	}
 
-	boost::optional<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 {
+	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;
+	boost::filesystem::path default_directory_or(boost::filesystem::path a) const;
+	boost::filesystem::path default_kdm_directory_or(boost::filesystem::path a) const;
 
 	enum class CinemasAction
 	{
@@ -125,35 +125,35 @@ public:
 	};
 
 	/** @return base port number to use for J2K encoding servers */
-	int server_port_base () const {
+	int server_port_base() const {
 		return _server_port_base;
 	}
 
-	void set_use_any_servers (bool u) {
+	void set_use_any_servers(bool u) {
 		_use_any_servers = u;
-		changed (USE_ANY_SERVERS);
+		changed(USE_ANY_SERVERS);
 	}
 
-	bool use_any_servers () const {
+	bool use_any_servers() const {
 		return _use_any_servers;
 	}
 
 	/** @param s New list of servers */
-	void set_servers (std::vector<std::string> s) {
+	void set_servers(std::vector<std::string> s) {
 		_servers = s;
-		changed (SERVERS);
+		changed(SERVERS);
 	}
 
 	/** @return Host names / IP addresses of J2K encoding servers that should definitely be used */
-	std::vector<std::string> servers () const {
+	std::vector<std::string> servers() const {
 		return _servers;
 	}
 
-	bool only_servers_encode () const {
+	bool only_servers_encode() const {
 		return _only_servers_encode;
 	}
 
-	FileTransferProtocol tms_protocol () const {
+	FileTransferProtocol tms_protocol() const {
 		return _tms_protocol;
 	}
 
@@ -162,86 +162,86 @@ public:
 	}
 
 	/** @return The IP address of a TMS that we can copy DCPs to */
-	std::string tms_ip () const {
+	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 {
+	std::string tms_path() const {
 		return _tms_path;
 	}
 
 	/** @return User name to log into the TMS with */
-	std::string tms_user () const {
+	std::string tms_user() const {
 		return _tms_user;
 	}
 
 	/** @return Password to log into the TMS with */
-	std::string tms_password () const {
+	std::string tms_password() const {
 		return _tms_password;
 	}
 
-	std::list<int> allowed_dcp_frame_rates () const {
+	std::list<int> allowed_dcp_frame_rates() const {
 		return _allowed_dcp_frame_rates;
 	}
 
-	bool allow_any_dcp_frame_rate () const {
+	bool allow_any_dcp_frame_rate() const {
 		return _allow_any_dcp_frame_rate;
 	}
 
-	bool allow_any_container () const {
+	bool allow_any_container() const {
 		return _allow_any_container;
 	}
 
-	bool allow_96khz_audio () const {
+	bool allow_96khz_audio() const {
 		return _allow_96khz_audio;
 	}
 
-	bool use_all_audio_channels () const {
+	bool use_all_audio_channels() const {
 		return _use_all_audio_channels;
 	}
 
-	bool show_experimental_audio_processors () const {
+	bool show_experimental_audio_processors() const {
 		return _show_experimental_audio_processors;
 	}
 
-	boost::optional<std::string> language () const {
+	boost::optional<std::string> language() const {
 		return _language;
 	}
 
-	int default_still_length () const {
+	int default_still_length() const {
 		return _default_still_length;
 	}
 
-	DCPContentType const * default_dcp_content_type () const {
+	DCPContentType const * default_dcp_content_type() const {
 		return _default_dcp_content_type;
 	}
 
-	int default_dcp_audio_channels () const {
+	int default_dcp_audio_channels() const {
 		return _default_dcp_audio_channels;
 	}
 
-	std::string dcp_issuer () const {
+	std::string dcp_issuer() const {
 		return _dcp_issuer;
 	}
 
-	std::string dcp_creator () const {
+	std::string dcp_creator() const {
 		return _dcp_creator;
 	}
 
-	std::string dcp_company_name () const {
+	std::string dcp_company_name() const {
 		return _dcp_company_name;
 	}
 
-	std::string dcp_product_name () const {
+	std::string dcp_product_name() const {
 		return _dcp_product_name;
 	}
 
-	std::string dcp_product_version () const {
+	std::string dcp_product_version() const {
 		return _dcp_product_version;
 	}
 
-	std::string dcp_j2k_comment () const {
+	std::string dcp_j2k_comment() const {
 		return _dcp_j2k_comment;
 	}
 
@@ -249,11 +249,11 @@ public:
 		return _default_video_bit_rate[encoding];
 	}
 
-	int default_audio_delay () const {
+	int default_audio_delay() const {
 		return _default_audio_delay;
 	}
 
-	bool default_interop () const {
+	bool default_interop() const {
 		return _default_interop;
 	}
 
@@ -265,99 +265,99 @@ public:
 		return _default_territory;
 	}
 
-	std::map<std::string, std::string> default_metadata () const {
+	std::map<std::string, std::string> default_metadata() const {
 		return _default_metadata;
 	}
 
-	bool upload_after_make_dcp () {
+	bool upload_after_make_dcp() {
 		return _upload_after_make_dcp;
 	}
 
-	void set_default_kdm_directory (boost::filesystem::path d) {
+	void set_default_kdm_directory(boost::filesystem::path d) {
 		if (_default_kdm_directory && _default_kdm_directory.get() == d) {
 			return;
 		}
 		_default_kdm_directory = d;
-		changed ();
+		changed();
 	}
 
-	std::string mail_server () const {
+	std::string mail_server() const {
 		return _mail_server;
 	}
 
-	int mail_port () const {
+	int mail_port() const {
 		return _mail_port;
 	}
 
-	EmailProtocol mail_protocol () const {
+	EmailProtocol mail_protocol() const {
 		return _mail_protocol;
 	}
 
-	std::string mail_user () const {
+	std::string mail_user() const {
 		return _mail_user;
 	}
 
-	std::string mail_password () const {
+	std::string mail_password() const {
 		return _mail_password;
 	}
 
-	std::string kdm_subject () const {
+	std::string kdm_subject() const {
 		return _kdm_subject;
 	}
 
-	std::string kdm_from () const {
+	std::string kdm_from() const {
 		return _kdm_from;
 	}
 
-	std::vector<std::string> kdm_cc () const {
+	std::vector<std::string> kdm_cc() const {
 		return _kdm_cc;
 	}
 
-	std::string kdm_bcc () const {
+	std::string kdm_bcc() const {
 		return _kdm_bcc;
 	}
 
-	std::string kdm_email () const {
+	std::string kdm_email() const {
 		return _kdm_email;
 	}
 
-	std::string notification_subject () const {
+	std::string notification_subject() const {
 		return _notification_subject;
 	}
 
-	std::string notification_from () const {
+	std::string notification_from() const {
 		return _notification_from;
 	}
 
-	std::string notification_to () const {
+	std::string notification_to() const {
 		return _notification_to;
 	}
 
-	std::vector<std::string> notification_cc () const {
+	std::vector<std::string> notification_cc() const {
 		return _notification_cc;
 	}
 
-	std::string notification_bcc () const {
+	std::string notification_bcc() const {
 		return _notification_bcc;
 	}
 
-	std::string notification_email () const {
+	std::string notification_email() const {
 		return _notification_email;
 	}
 
-	std::shared_ptr<const dcp::CertificateChain> signer_chain () const {
+	std::shared_ptr<const dcp::CertificateChain> signer_chain() const {
 		return _signer_chain;
 	}
 
-	std::shared_ptr<const dcp::CertificateChain> decryption_chain () const {
+	std::shared_ptr<const dcp::CertificateChain> decryption_chain() const {
 		return _decryption_chain;
 	}
 
-	bool check_for_updates () const {
+	bool check_for_updates() const {
 		return _check_for_updates;
 	}
 
-	bool check_for_test_updates () const {
+	bool check_for_test_updates() const {
 		return _check_for_test_updates;
 	}
 
@@ -365,73 +365,73 @@ public:
 		return _maximum_video_bit_rate[encoding];
 	}
 
-	int log_types () const {
+	int log_types() const {
 		return _log_types;
 	}
 
-	bool analyse_ebur128 () const {
+	bool analyse_ebur128() const {
 		return _analyse_ebur128;
 	}
 
-	bool automatic_audio_analysis () const {
+	bool automatic_audio_analysis() const {
 		return _automatic_audio_analysis;
 	}
 
 #ifdef DCPOMATIC_WINDOWS
-	bool win32_console () const {
+	bool win32_console() const {
 		return _win32_console;
 	}
 #endif
 
-	std::vector<boost::filesystem::path> history () const {
+	std::vector<boost::filesystem::path> history() const {
 		return _history;
 	}
 
-	std::vector<boost::filesystem::path> player_history () const {
+	std::vector<boost::filesystem::path> player_history() const {
 		return _player_history;
 	}
 
-	std::shared_ptr<DKDMGroup> dkdms () const {
+	std::shared_ptr<DKDMGroup> dkdms() const {
 		return _dkdms;
 	}
 
-	boost::filesystem::path cinemas_file () const {
+	boost::filesystem::path cinemas_file() const {
 		return _cinemas_file;
 	}
 
-	boost::filesystem::path dkdm_recipients_file () const {
+	boost::filesystem::path dkdm_recipients_file() const {
 		return _dkdm_recipients_file;
 	}
 
-	bool show_hints_before_make_dcp () const {
+	bool show_hints_before_make_dcp() const {
 		return _show_hints_before_make_dcp;
 	}
 
-	bool confirm_kdm_email () const {
+	bool confirm_kdm_email() const {
 		return _confirm_kdm_email;
 	}
 
-	dcp::NameFormat kdm_container_name_format () const {
+	dcp::NameFormat kdm_container_name_format() const {
 		return _kdm_container_name_format;
 	}
 
-	dcp::NameFormat kdm_filename_format () const {
+	dcp::NameFormat kdm_filename_format() const {
 		return _kdm_filename_format;
 	}
 
-	dcp::NameFormat dkdm_filename_format () const {
+	dcp::NameFormat dkdm_filename_format() const {
 		return _dkdm_filename_format;
 	}
 
-	dcp::NameFormat dcp_metadata_filename_format () const {
+	dcp::NameFormat dcp_metadata_filename_format() const {
 		return _dcp_metadata_filename_format;
 	}
 
-	dcp::NameFormat dcp_asset_filename_format () const {
+	dcp::NameFormat dcp_asset_filename_format() const {
 		return _dcp_asset_filename_format;
 	}
 
-	bool jump_to_selected () const {
+	bool jump_to_selected() const {
 		return _jump_to_selected;
 	}
 
@@ -452,23 +452,23 @@ public:
 		NAG_COUNT
 	};
 
-	bool nagged (Nag nag) const {
+	bool nagged(Nag nag) const {
 		return _nagged[nag];
 	}
 
-	bool sound () const {
+	bool sound() const {
 		return _sound;
 	}
 
-	std::string cover_sheet () const {
+	std::string cover_sheet() const {
 		return _cover_sheet;
 	}
 
-	boost::optional<std::string> sound_output () const {
+	boost::optional<std::string> sound_output() const {
 		return _sound_output;
 	}
 
-	boost::optional<boost::filesystem::path> last_player_load_directory () const {
+	boost::optional<boost::filesystem::path> last_player_load_directory() const {
 		return _last_player_load_directory;
 	}
 
@@ -478,7 +478,7 @@ public:
 		KDM_WRITE_ZIP
 	};
 
-	boost::optional<KDMWriteType> last_kdm_write_type () const {
+	boost::optional<KDMWriteType> last_kdm_write_type() const {
 		return _last_kdm_write_type;
 	}
 
@@ -487,19 +487,19 @@ public:
 		DKDM_WRITE_FILE
 	};
 
-	boost::optional<DKDMWriteType> last_dkdm_write_type () const {
+	boost::optional<DKDMWriteType> last_dkdm_write_type() const {
 		return _last_dkdm_write_type;
 	}
 
-	int frames_in_memory_multiplier () const {
+	int frames_in_memory_multiplier() const {
 		return _frames_in_memory_multiplier;
 	}
 
-	boost::optional<int> decode_reduction () const {
+	boost::optional<int> decode_reduction() const {
 		return _decode_reduction;
 	}
 
-	bool default_notify () const {
+	bool default_notify() const {
 		return _default_notify;
 	}
 
@@ -509,31 +509,31 @@ public:
 		NOTIFICATION_COUNT
 	};
 
-	bool notification (Notification n) const {
+	bool notification(Notification n) const {
 		return _notification[n];
 	}
 
-	boost::optional<std::string> barco_username () const {
+	boost::optional<std::string> barco_username() const {
 		return _barco_username;
 	}
 
-	boost::optional<std::string> barco_password () const {
+	boost::optional<std::string> barco_password() const {
 		return _barco_password;
 	}
 
-	boost::optional<std::string> christie_username () const {
+	boost::optional<std::string> christie_username() const {
 		return _christie_username;
 	}
 
-	boost::optional<std::string> christie_password () const {
+	boost::optional<std::string> christie_password() const {
 		return _christie_password;
 	}
 
-	boost::optional<std::string> gdc_username () const {
+	boost::optional<std::string> gdc_username() const {
 		return _gdc_username;
 	}
 
-	boost::optional<std::string> gdc_password () const {
+	boost::optional<std::string> gdc_password() const {
 		return _gdc_password;
 	}
 
@@ -543,7 +543,7 @@ public:
 		PLAYER_MODE_DUAL    ///< image on one monitor and extended controls on the other
 	};
 
-	PlayerMode player_mode () const {
+	PlayerMode player_mode() const {
 		return _player_mode;
 	}
 
@@ -555,7 +555,7 @@ public:
 		return _playlist_editor_restricted_menus;
 	}
 
-	int image_display () const {
+	int image_display() const {
 		return _image_display;
 	}
 
@@ -564,63 +564,63 @@ public:
 		VIDEO_VIEW_OPENGL
 	};
 
-	VideoViewType video_view_type () const {
+	VideoViewType video_view_type() const {
 		return _video_view_type;
 	}
 
-	bool respect_kdm_validity_periods () const {
+	bool respect_kdm_validity_periods() const {
 		return _respect_kdm_validity_periods;
 	}
 
-	boost::optional<boost::filesystem::path> player_debug_log_file () const {
+	boost::optional<boost::filesystem::path> player_debug_log_file() const {
 		return _player_debug_log_file;
 	}
 
-	boost::optional<boost::filesystem::path> player_content_directory () const {
+	boost::optional<boost::filesystem::path> player_content_directory() const {
 		return _player_content_directory;
 	}
 
-	boost::optional<boost::filesystem::path> player_playlist_directory () const {
+	boost::optional<boost::filesystem::path> player_playlist_directory() const {
 		return _player_playlist_directory;
 	}
 
-	boost::optional<boost::filesystem::path> player_kdm_directory () const {
+	boost::optional<boost::filesystem::path> player_kdm_directory() const {
 		return _player_kdm_directory;
 	}
 
-	AudioMapping audio_mapping (int output_channels);
+	AudioMapping audio_mapping(int output_channels);
 
-	std::vector<dcp::LanguageTag> custom_languages () const {
+	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 {
+	bool use_isdcf_name_by_default() const {
 		return _use_isdcf_name_by_default;
 	}
 
-	bool write_kdms_to_disk () const {
+	bool write_kdms_to_disk() const {
 		return _write_kdms_to_disk;
 	}
 
-	bool email_kdms () const {
+	bool email_kdms() const {
 		return _email_kdms;
 	}
 
-	dcp::Formulation default_kdm_type () const {
+	dcp::Formulation default_kdm_type() const {
 		return _default_kdm_type;
 	}
 
-	RoughDuration default_kdm_duration () const {
+	RoughDuration default_kdm_duration() const {
 		return _default_kdm_duration;
 	}
 
-	double auto_crop_threshold () const {
+	double auto_crop_threshold() const {
 		return _auto_crop_threshold;
 	}
 
-	boost::optional<std::string> last_release_notes_version () const {
+	boost::optional<std::string> last_release_notes_version() const {
 		return _last_release_notes_version;
 	}
 
@@ -688,33 +688,33 @@ public:
 
 	/* SET (mostly) */
 
-	void set_master_encoding_threads (int n) {
-		maybe_set (_master_encoding_threads, n);
+	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_server_encoding_threads(int n) {
+		maybe_set(_server_encoding_threads, n);
 	}
 
-	void set_default_directory (boost::filesystem::path d) {
+	void set_default_directory(boost::filesystem::path d) {
 		if (_default_directory && *_default_directory == d) {
 			return;
 		}
 		_default_directory = d;
-		changed ();
+		changed();
 	}
 
 	/** @param p New server port */
-	void set_server_port_base (int p) {
-		maybe_set (_server_port_base, p);
+	void set_server_port_base(int p) {
+		maybe_set(_server_port_base, p);
 	}
 
-	void set_only_servers_encode (bool o) {
-		maybe_set (_only_servers_encode, o);
+	void set_only_servers_encode(bool o) {
+		maybe_set(_only_servers_encode, o);
 	}
 
-	void set_tms_protocol (FileTransferProtocol p) {
-		maybe_set (_tms_protocol, p);
+	void set_tms_protocol(FileTransferProtocol p) {
+		maybe_set(_tms_protocol, p);
 	}
 
 	void set_tms_passive(bool passive) {
@@ -722,96 +722,96 @@ public:
 	}
 
 	/** @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);
+	void set_tms_ip(std::string i) {
+		maybe_set(_tms_ip, i);
 	}
 
 	/** @param p Path on a TMS that we should changed DCPs to */
-	void set_tms_path (std::string p) {
-		maybe_set (_tms_path, p);
+	void set_tms_path(std::string p) {
+		maybe_set(_tms_path, p);
 	}
 
 	/** @param u User name to log into the TMS with */
-	void set_tms_user (std::string u) {
-		maybe_set (_tms_user, u);
+	void set_tms_user(std::string u) {
+		maybe_set(_tms_user, u);
 	}
 
 	/** @param p Password to log into the TMS with */
-	void set_tms_password (std::string p) {
-		maybe_set (_tms_password, p);
+	void set_tms_password(std::string p) {
+		maybe_set(_tms_password, p);
 	}
 
-	void set_allowed_dcp_frame_rates (std::list<int> const & r) {
-		maybe_set (_allowed_dcp_frame_rates, r);
+	void set_allowed_dcp_frame_rates(std::list<int> const & r) {
+		maybe_set(_allowed_dcp_frame_rates, r);
 	}
 
-	void set_allow_any_dcp_frame_rate (bool a) {
-		maybe_set (_allow_any_dcp_frame_rate, a);
+	void set_allow_any_dcp_frame_rate(bool a) {
+		maybe_set(_allow_any_dcp_frame_rate, a);
 	}
 
-	void set_allow_any_container (bool a) {
+	void set_allow_any_container(bool a) {
 		maybe_set(_allow_any_container, a, ALLOW_ANY_CONTAINER);
 	}
 
-	void set_allow_96hhz_audio (bool a) {
-		maybe_set (_allow_96khz_audio, 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_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_show_experimental_audio_processors(bool e) {
+		maybe_set(_show_experimental_audio_processors, e, SHOW_EXPERIMENTAL_AUDIO_PROCESSORS);
 	}
 
-	void set_language (std::string l) {
+	void set_language(std::string l) {
 		if (_language && _language.get() == l) {
 			return;
 		}
 		_language = l;
-		changed ();
+		changed();
 	}
 
-	void unset_language () {
+	void unset_language() {
 		if (!_language) {
 			return;
 		}
 
 		_language = boost::none;
-		changed ();
+		changed();
 	}
 
-	void set_default_still_length (int s) {
-		maybe_set (_default_still_length, s);
+	void set_default_still_length(int s) {
+		maybe_set(_default_still_length, s);
 	}
 
-	void set_dcp_issuer (std::string i) {
-		maybe_set (_dcp_issuer, i);
+	void set_dcp_issuer(std::string i) {
+		maybe_set(_dcp_issuer, i);
 	}
 
-	void set_dcp_creator (std::string c) {
-		maybe_set (_dcp_creator, c);
+	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_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_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_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_dcp_j2k_comment(std::string c) {
+		maybe_set(_dcp_j2k_comment, c);
 	}
 
-	void set_default_audio_delay (int d) {
-		maybe_set (_default_audio_delay, d);
+	void set_default_audio_delay(int d) {
+		maybe_set(_default_audio_delay, d);
 	}
 
 	void set_default_audio_language(dcp::LanguageTag tag) {
@@ -822,157 +822,157 @@ public:
 		maybe_set(_default_audio_language, boost::optional<dcp::LanguageTag>());
 	}
 
-	void set_upload_after_make_dcp (bool u) {
-		maybe_set (_upload_after_make_dcp, u);
+	void set_upload_after_make_dcp(bool u) {
+		maybe_set(_upload_after_make_dcp, u);
 	}
 
-	void set_mail_server (std::string s) {
-		maybe_set (_mail_server, s);
+	void set_mail_server(std::string s) {
+		maybe_set(_mail_server, s);
 	}
 
-	void set_mail_port (int p) {
-		maybe_set (_mail_port, p);
+	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_protocol(EmailProtocol p) {
+		maybe_set(_mail_protocol, p);
 	}
 
-	void set_mail_user (std::string u) {
-		maybe_set (_mail_user, u);
+	void set_mail_user(std::string u) {
+		maybe_set(_mail_user, u);
 	}
 
-	void set_mail_password (std::string p) {
-		maybe_set (_mail_password, p);
+	void set_mail_password(std::string p) {
+		maybe_set(_mail_password, p);
 	}
 
-	void set_kdm_subject (std::string s) {
-		maybe_set (_kdm_subject, s);
+	void set_kdm_subject(std::string s) {
+		maybe_set(_kdm_subject, s);
 	}
 
-	void set_kdm_from (std::string f) {
-		maybe_set (_kdm_from, f);
+	void set_kdm_from(std::string f) {
+		maybe_set(_kdm_from, f);
 	}
 
-	void set_kdm_cc (std::vector<std::string> f) {
-		maybe_set (_kdm_cc, f);
+	void set_kdm_cc(std::vector<std::string> f) {
+		maybe_set(_kdm_cc, f);
 	}
 
-	void set_kdm_bcc (std::string f) {
-		maybe_set (_kdm_bcc, f);
+	void set_kdm_bcc(std::string f) {
+		maybe_set(_kdm_bcc, f);
 	}
 
-	void set_kdm_email (std::string e) {
-		maybe_set (_kdm_email, e);
+	void set_kdm_email(std::string e) {
+		maybe_set(_kdm_email, e);
 	}
 
-	void reset_kdm_email ();
+	void reset_kdm_email();
 
-	void set_notification_subject (std::string s) {
-		maybe_set (_notification_subject, s);
+	void set_notification_subject(std::string s) {
+		maybe_set(_notification_subject, s);
 	}
 
-	void set_notification_from (std::string f) {
-		maybe_set (_notification_from, f);
+	void set_notification_from(std::string f) {
+		maybe_set(_notification_from, f);
 	}
 
-	void set_notification_to (std::string t) {
-		maybe_set (_notification_to, t);
+	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_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_bcc(std::string f) {
+		maybe_set(_notification_bcc, f);
 	}
 
-	void set_notification_email (std::string e) {
-		maybe_set (_notification_email, e);
+	void set_notification_email(std::string e) {
+		maybe_set(_notification_email, e);
 	}
 
-	void reset_notification_email ();
+	void reset_notification_email();
 
-	void set_signer_chain (std::shared_ptr<const dcp::CertificateChain> s) {
-		maybe_set (_signer_chain, s);
+	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_decryption_chain(std::shared_ptr<const dcp::CertificateChain> c) {
+		maybe_set(_decryption_chain, c);
 	}
 
-	void set_check_for_updates (bool c) {
-		maybe_set (_check_for_updates, c);
+	void set_check_for_updates(bool c) {
+		maybe_set(_check_for_updates, c);
 		if (!c) {
-			set_check_for_test_updates (false);
+			set_check_for_test_updates(false);
 		}
 	}
 
-	void set_check_for_test_updates (bool c) {
-		maybe_set (_check_for_test_updates, c);
+	void set_check_for_test_updates(bool c) {
+		maybe_set(_check_for_test_updates, c);
 	}
 
 	void set_maximum_video_bit_rate(VideoEncoding encoding, int64_t b) {
 		maybe_set(_maximum_video_bit_rate[encoding], b);
 	}
 
-	void set_log_types (int t) {
-		maybe_set (_log_types, t);
+	void set_log_types(int t) {
+		maybe_set(_log_types, t);
 	}
 
-	void set_analyse_ebur128 (bool a) {
-		maybe_set (_analyse_ebur128, a);
+	void set_analyse_ebur128(bool a) {
+		maybe_set(_analyse_ebur128, a);
 	}
 
-	void set_automatic_audio_analysis (bool a) {
-		maybe_set (_automatic_audio_analysis, a);
+	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);
+	void set_win32_console(bool c) {
+		maybe_set(_win32_console, c);
 	}
 #endif
 
-	void set_dkdms (std::shared_ptr<DKDMGroup> dkdms) {
+	void set_dkdms(std::shared_ptr<DKDMGroup> dkdms) {
 		_dkdms = dkdms;
-		changed ();
+		changed();
 	}
 
-	void set_cinemas_file (boost::filesystem::path file);
+	void set_cinemas_file(boost::filesystem::path file);
 
 	void set_dkdm_recipients_file(boost::filesystem::path file);
 
-	void set_show_hints_before_make_dcp (bool s) {
-		maybe_set (_show_hints_before_make_dcp, s);
+	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_confirm_kdm_email(bool s) {
+		maybe_set(_confirm_kdm_email, s);
 	}
 
-	void set_sound (bool s) {
-		maybe_set (_sound, s, SOUND);
+	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_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_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_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 set_last_dkdm_write_type(DKDMWriteType t) {
+		maybe_set(_last_dkdm_write_type, t);
 	}
 
-	void unset_sound_output () {
+	void unset_sound_output() {
 		if (!_sound_output) {
 			return;
 		}
@@ -981,216 +981,216 @@ public:
 		changed(SOUND_OUTPUT);
 	}
 
-	void set_kdm_container_name_format (dcp::NameFormat n) {
-		maybe_set (_kdm_container_name_format, n);
+	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_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_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_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_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_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_decode_reduction(boost::optional<int> r) {
+		maybe_set(_decode_reduction, r);
 	}
 
-	void set_default_notify (bool n) {
-		maybe_set (_default_notify, n);
+	void set_default_notify(bool n) {
+		maybe_set(_default_notify, n);
 	}
 
-	void clear_history () {
-		_history.clear ();
-		changed ();
+	void clear_history() {
+		_history.clear();
+		changed();
 	}
 
-	void clear_player_history () {
-		_player_history.clear ();
-		changed ();
+	void clear_player_history() {
+		_player_history.clear();
+		changed();
 	}
 
-	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 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);
+	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_nagged(Nag nag, bool nagged) {
+		maybe_set(_nagged[nag], nagged);
 	}
 
-	void set_cover_sheet (std::string s) {
-		maybe_set (_cover_sheet, s);
+	void set_cover_sheet(std::string s) {
+		maybe_set(_cover_sheet, s);
 	}
 
-	void reset_cover_sheet ();
+	void reset_cover_sheet();
 
-	void set_notification (Notification n, bool v) {
-		maybe_set (_notification[n], v);
+	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 set_barco_username(std::string u) {
+		maybe_set(_barco_username, u);
 	}
 
-	void unset_barco_username () {
-		maybe_set (_barco_username, boost::optional<std::string>());
+	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 set_barco_password(std::string p) {
+		maybe_set(_barco_password, p);
 	}
 
-	void unset_barco_password () {
-		maybe_set (_barco_password, boost::optional<std::string>());
+	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 set_christie_username(std::string u) {
+		maybe_set(_christie_username, u);
 	}
 
-	void unset_christie_username () {
-		maybe_set (_christie_username, boost::optional<std::string>());
+	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 set_christie_password(std::string p) {
+		maybe_set(_christie_password, p);
 	}
 
-	void unset_christie_password () {
-		maybe_set (_christie_password, boost::optional<std::string>());
+	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 set_gdc_username(std::string u) {
+		maybe_set(_gdc_username, u);
 	}
 
-	void unset_gdc_username () {
-		maybe_set (_gdc_username, boost::optional<std::string>());
+	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 set_gdc_password(std::string p) {
+		maybe_set(_gdc_password, p);
 	}
 
-	void unset_gdc_password () {
-		maybe_set (_gdc_password, boost::optional<std::string>());
+	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_player_mode(PlayerMode m) {
+		maybe_set(_player_mode, m);
 	}
 
-	void set_image_display (int n) {
-		maybe_set (_image_display, n);
+	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_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_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 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 () {
+	void unset_player_debug_log_file() {
 		if (!_player_debug_log_file) {
 			return;
 		}
 		_player_debug_log_file = boost::none;
-		changed (PLAYER_DEBUG_LOG);
+		changed(PLAYER_DEBUG_LOG);
 	}
 
-	void set_player_content_directory (boost::filesystem::path p) {
-		maybe_set (_player_content_directory, p, PLAYER_CONTENT_DIRECTORY);
+	void set_player_content_directory(boost::filesystem::path p) {
+		maybe_set(_player_content_directory, p, PLAYER_CONTENT_DIRECTORY);
 	}
 
-	void unset_player_content_directory () {
+	void unset_player_content_directory() {
 		if (!_player_content_directory) {
 			return;
 		}
 		_player_content_directory = boost::none;
-		changed (PLAYER_CONTENT_DIRECTORY);
+		changed(PLAYER_CONTENT_DIRECTORY);
 	}
 
-	void set_player_playlist_directory (boost::filesystem::path p) {
-		maybe_set (_player_playlist_directory, p, PLAYER_PLAYLIST_DIRECTORY);
+	void set_player_playlist_directory(boost::filesystem::path p) {
+		maybe_set(_player_playlist_directory, p, PLAYER_PLAYLIST_DIRECTORY);
 	}
 
-	void unset_player_playlist_directory () {
+	void unset_player_playlist_directory() {
 		if (!_player_playlist_directory) {
 			return;
 		}
 		_player_playlist_directory = boost::none;
-		changed (PLAYER_PLAYLIST_DIRECTORY);
+		changed(PLAYER_PLAYLIST_DIRECTORY);
 	}
 
-	void set_player_kdm_directory (boost::filesystem::path p) {
-		maybe_set (_player_kdm_directory, p);
+	void set_player_kdm_directory(boost::filesystem::path p) {
+		maybe_set(_player_kdm_directory, p);
 	}
 
-	void unset_player_kdm_directory () {
+	void unset_player_kdm_directory() {
 		if (!_player_kdm_directory) {
 			return;
 		}
 		_player_kdm_directory = boost::none;
-		changed ();
+		changed();
 	}
 
-	void set_audio_mapping (AudioMapping m);
-	void set_audio_mapping_to_default ();
+	void set_audio_mapping(AudioMapping m);
+	void set_audio_mapping_to_default();
 
-	void add_custom_language (dcp::LanguageTag tag);
+	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 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_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_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_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_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_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);
+	void set_last_release_notes_version(std::string version) {
+		maybe_set(_last_release_notes_version, version);
 	}
 
 	void unset_last_release_notes_version() {
@@ -1242,7 +1242,7 @@ public:
 	}
 
 
-	void changed (Property p = OTHER);
+	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.
@@ -1266,64 +1266,64 @@ public:
 
 	static boost::signals2::signal<bool (BadReason)> Bad;
 
-	void write () const override;
-	void write_config () 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 write() const override;
+	void write_config() 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_default_template(std::shared_ptr<const Film> film) const;
-	void save_template (std::shared_ptr<const Film> film, std::string name) const;
-	bool existing_template (std::string name) const;
-	/** @return Template names (not including the default) */
+	void save_template(std::shared_ptr<const Film> film, std::string name) const;
+	bool existing_template(std::string name) const;
+	/** @return Template names(not including the default) */
 	std::vector<std::string> templates() const;
-	boost::filesystem::path template_read_path (std::string name) const;
+	boost::filesystem::path template_read_path(std::string name) const;
 	boost::filesystem::path default_template_read_path() const;
-	void rename_template (std::string old_name, std::string new_name) const;
-	void delete_template (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;
+	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 ();
+	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();
 	static bool zip_contains_cinemas(boost::filesystem::path zip);
 	static boost::filesystem::path cinemas_file_from_zip(boost::filesystem::path zip);
 
 
 	template <class T>
-	void maybe_set (T& member, T new_value, Property prop = OTHER) {
+	void maybe_set(T& member, T new_value, Property prop = OTHER) {
 		if (member == new_value) {
 			return;
 		}
 		member = new_value;
-		changed (prop);
+		changed(prop);
 	}
 
 	template <class T>
-	void maybe_set (boost::optional<T>& member, T new_value, Property prop = OTHER) {
+	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);
+		changed(prop);
 	}
 
 private:
-	Config ();
-	void read () override;
-	void set_defaults ();
-	void set_kdm_email_to_default ();
-	void set_notification_email_to_default ();
-	void set_cover_sheet_to_default ();
-	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 ();
+	Config();
+	void read() override;
+	void set_defaults();
+	void set_kdm_email_to_default();
+	void set_notification_email_to_default();
+	void set_cover_sheet_to_default();
+	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();
 	boost::filesystem::path template_write_path(std::string name) const;
 
 	/** number of threads which a master DoM should use for J2K encoding on the local machine */