X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=2535bd82ae0d5ef3f34ca891b04c0f15623888d0;hb=53d0a9a844841fe10b2720543c032a687c548108;hp=9c3650f8d00af1d8cfb0f6f2b2ad1cf33136942a;hpb=fcba100f0dfd1d4214291abb76f22ebd696c24d4;p=dcpomatic.git

diff --git a/src/lib/config.h b/src/lib/config.h
index 9c3650f8d..2535bd82a 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -31,7 +31,6 @@
 #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>
@@ -130,6 +129,10 @@ public:
 		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;
@@ -174,6 +177,10 @@ public:
 		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;
 	}
@@ -186,10 +193,6 @@ public:
 		return _default_still_length;
 	}
 
-	Ratio const * default_container () const {
-		return _default_container;
-	}
-
 	DCPContentType const * default_dcp_content_type () const {
 		return _default_dcp_content_type;
 	}
@@ -234,6 +237,14 @@ public:
 		return _default_interop;
 	}
 
+	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;
 	}
@@ -582,6 +593,18 @@ public:
 		return _auto_crop_threshold;
 	}
 
+	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;
+	}
+
 	/* SET (mostly) */
 
 	void set_master_encoding_threads (int n) {
@@ -613,6 +636,10 @@ public:
 		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);
@@ -669,6 +696,10 @@ public:
 		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);
 	}
@@ -694,10 +725,6 @@ public:
 		maybe_set (_default_still_length, s);
 	}
 
-	void set_default_container (Ratio const * c) {
-		maybe_set (_default_container, c);
-	}
-
 	void set_default_dcp_content_type (DCPContentType const * t) {
 		maybe_set (_default_dcp_content_type, t);
 	}
@@ -742,6 +769,22 @@ public:
 		maybe_set (_default_interop, i);
 	}
 
+	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);
 	}
@@ -1114,16 +1157,37 @@ public:
 		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 unset_last_release_notes_version() {
+		maybe_set(_last_release_notes_version, boost::optional<std::string>());
+	}
+
 	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 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 something wrong the contents of our config.  Handler can call
@@ -1184,6 +1248,9 @@ public:
 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 ();
@@ -1212,6 +1279,7 @@ private:
 	std::vector<std::string> _servers;
 	bool _only_servers_encode;
 	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 */
@@ -1230,12 +1298,12 @@ private:
 	*/
 	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;
-	Ratio const * _default_container;
 	DCPContentType const * _default_dcp_content_type;
 	int _default_dcp_audio_channels;
 	std::string _dcp_issuer;
@@ -1247,6 +1315,8 @@ private:
 	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.
@@ -1340,6 +1410,9 @@ private:
 	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;
 
 	ExportConfig _export;