X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=46bd390cc8628773edd0e476781c099f016c794f;hb=2e2f11b29651cffe37c64275dbd45c7563310020;hp=87afcbba829bac3944a04494f55ca9e62f29fc26;hpb=a332bd6be323f03dad5b180fb237afe54f1bf81e;p=dcpomatic.git

diff --git a/src/lib/config.h b/src/lib/config.h
index 87afcbba8..46bd390cc 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -25,15 +25,13 @@
 #ifndef DCPOMATIC_CONFIG_H
 #define DCPOMATIC_CONFIG_H
 
-#include "isdcf_metadata.h"
 #include "types.h"
 #include "state.h"
-#include "edid.h"
 #include "audio_mapping.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>
@@ -142,11 +140,11 @@ public:
 		return _tms_password;
 	}
 
-	std::list<boost::shared_ptr<Cinema> > cinemas () const {
+	std::list<std::shared_ptr<Cinema> > cinemas () const {
 		return _cinemas;
 	}
 
-	std::list<boost::shared_ptr<DKDMRecipient> > dkdm_recipients () const {
+	std::list<std::shared_ptr<DKDMRecipient> > dkdm_recipients () const {
 		return _dkdm_recipients;
 	}
 
@@ -166,10 +164,6 @@ public:
 		return _show_experimental_audio_processors;
 	}
 
-	ISDCFMetadata default_isdcf_metadata () const {
-		return _default_isdcf_metadata;
-	}
-
 	boost::optional<std::string> language () const {
 		return _language;
 	}
@@ -226,6 +220,10 @@ public:
 		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;
 	}
@@ -302,11 +300,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;
 	}
 
@@ -348,7 +346,7 @@ public:
 		return _player_history;
 	}
 
-	boost::shared_ptr<DKDMGroup> dkdms () const {
+	std::shared_ptr<DKDMGroup> dkdms () const {
 		return _dkdms;
 	}
 
@@ -392,6 +390,9 @@ 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,
@@ -400,6 +401,7 @@ public:
 		NAG_IMPORT_DECRYPTION_CHAIN,
 		NAG_DELETE_DKDM,
 		NAG_32_ON_64,
+		NAG_TOO_MANY_DROPPED_FRAMES,
 		NAG_COUNT
 	};
 
@@ -537,6 +539,14 @@ public:
 
 	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;
+	}
+
 	/* SET (mostly) */
 
 	void set_master_encoding_threads (int n) {
@@ -588,22 +598,22 @@ 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 (boost::shared_ptr<DKDMRecipient> c) {
+	void add_dkdm_recipient (std::shared_ptr<DKDMRecipient> c) {
 		_dkdm_recipients.push_back (c);
 		changed (DKDM_RECIPIENTS);
 	}
 
-	void remove_dkdm_recipient (boost::shared_ptr<DKDMRecipient> c) {
+	void remove_dkdm_recipient (std::shared_ptr<DKDMRecipient> c) {
 		_dkdm_recipients.remove (c);
 		changed (DKDM_RECIPIENTS);
 	}
@@ -624,10 +634,6 @@ public:
 		maybe_set (_show_experimental_audio_processors, e, SHOW_EXPERIMENTAL_AUDIO_PROCESSORS);
 	}
 
-	void set_default_isdcf_metadata (ISDCFMetadata d) {
-		maybe_set (_default_isdcf_metadata, d);
-	}
-
 	void set_language (std::string l) {
 		if (_language && _language.get() == l) {
 			return;
@@ -697,6 +703,10 @@ public:
 		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);
 	}
@@ -769,11 +779,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);
 	}
 
@@ -810,7 +820,7 @@ public:
 	}
 #endif
 
-	void set_dkdms (boost::shared_ptr<DKDMGroup> dkdms) {
+	void set_dkdms (std::shared_ptr<DKDMGroup> dkdms) {
 		_dkdms = dkdms;
 		changed ();
 	}
@@ -1048,6 +1058,13 @@ public:
 	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 changed (Property p = OTHER);
 	boost::signals2::signal<void (Property)> Changed;
 	/** Emitted if read() failed on an existing Config file.  There is nothing
@@ -1075,7 +1092,7 @@ public:
 	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;
@@ -1097,7 +1114,7 @@ private:
 	void set_cover_sheet_to_default ();
 	void read_cinemas (cxml::Document const & f);
 	void read_dkdm_recipients (cxml::Document const & f);
-	boost::shared_ptr<dcp::CertificateChain> create_certificate_chain ();
+	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);
@@ -1156,8 +1173,6 @@ private:
 	bool _allow_any_container;
 	/** Offer the upmixers in the audio processor settings */
 	bool _show_experimental_audio_processors;
-	/** Default ISDCF metadata for newly-created Films */
-	ISDCFMetadata _default_isdcf_metadata;
 	boost::optional<std::string> _language;
  	/** Default length of still image content (seconds) */
 	int _default_still_length;
@@ -1173,13 +1188,14 @@ private:
 	int _default_j2k_bandwidth;
 	int _default_audio_delay;
 	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<boost::shared_ptr<Cinema> > _cinemas;
-	std::list<boost::shared_ptr<DKDMRecipient> > _dkdm_recipients;
+	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;
@@ -1196,11 +1212,11 @@ private:
 	std::vector<std::string> _notification_cc;
 	std::string _notification_bcc;
 	std::string _notification_email;
-	boost::shared_ptr<const dcp::CertificateChain> _signer_chain;
+	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;
+	std::shared_ptr<const dcp::CertificateChain> _decryption_chain;
 	/** true to check for updates on startup */
 	bool _check_for_updates;
 	bool _check_for_test_updates;
@@ -1214,7 +1230,7 @@ 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;
@@ -1261,6 +1277,8 @@ private:
 	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;
 
 	static int const _current_version;