X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=a982c9727623783a48b0f7cfc5659480c630613e;hb=e075012124424b77044b5d61885ed2646d3781cd;hp=7f8dd0cd4be183b5259009fc1cc0d6c65f4243ce;hpb=627cf204ede4204b58c385c30e82561cfc93d28c;p=dcpomatic.git

diff --git a/src/lib/config.h b/src/lib/config.h
index 7f8dd0cd4..a982c9727 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -116,7 +116,7 @@ public:
 		return _only_servers_encode;
 	}
 
-	Protocol tms_protocol () const {
+	FileTransferProtocol tms_protocol () const {
 		return _tms_protocol;
 	}
 
@@ -229,6 +229,10 @@ public:
 		return _mail_port;
 	}
 
+	EmailProtocol mail_protocol () const {
+		return _mail_protocol;
+	}
+
 	std::string mail_user () const {
 		return _mail_user;
 	}
@@ -366,7 +370,7 @@ public:
 	enum Nag {
 		NAG_DKDM_CONFIG,
 		NAG_ENCRYPTED_METADATA,
-		NAG_REMAKE_DECRYPTION_CHAIN,
+		NAG_ALTER_DECRYPTION_CHAIN,
 		NAG_BAD_SIGNER_CHAIN,
 		/* Not really a nag but it's the same idea */
 		NAG_INITIAL_SETUP,
@@ -563,7 +567,7 @@ public:
 		maybe_set (_only_servers_encode, o);
 	}
 
-	void set_tms_protocol (Protocol p) {
+	void set_tms_protocol (FileTransferProtocol p) {
 		maybe_set (_tms_protocol, p);
 	}
 
@@ -682,6 +686,10 @@ public:
 		maybe_set (_mail_port, p);
 	}
 
+	void set_mail_protocol (EmailProtocol p) {
+		maybe_set (_mail_protocol, p);
+	}
+
 	void set_mail_user (std::string u) {
 		maybe_set (_mail_user, u);
 	}
@@ -1138,7 +1146,7 @@ private:
 	/** J2K encoding servers that should definitely be used */
 	std::vector<std::string> _servers;
 	bool _only_servers_encode;
-	Protocol _tms_protocol;
+	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 */
@@ -1180,6 +1188,7 @@ private:
 	std::list<boost::shared_ptr<Cinema> > _cinemas;
 	std::string _mail_server;
 	int _mail_port;
+	EmailProtocol _mail_protocol;
 	std::string _mail_user;
 	std::string _mail_password;
 	std::string _kdm_subject;