X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=44708a24fc231b561dcebe0efb84e2ade175fb9d;hb=c94d763e07d9e7b029091e1ea64ba4f7758b3d5b;hp=fc6315242b21d084ccdf94c696dbb039296d648e;hpb=89ae13638097f259f3e50b4b61068dd23451107d;p=dcpomatic.git

diff --git a/src/lib/config.h b/src/lib/config.h
index fc6315242..44708a24f 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -40,6 +40,7 @@ class DCPContentType;
 class Ratio;
 class Cinema;
 class Film;
+class DKDMGroup;
 
 /** @class Config
  *  @brief A singleton class holding configuration.
@@ -163,6 +164,10 @@ public:
 		return _default_container;
 	}
 
+	Ratio const * default_scale_to () const {
+		return _default_scale_to;
+	}
+
 	DCPContentType const * default_dcp_content_type () const {
 		return _default_dcp_content_type;
 	}
@@ -277,7 +282,7 @@ public:
 		return _history;
 	}
 
-	std::vector<dcp::EncryptedKDM> dkdms () const {
+	boost::shared_ptr<DKDMGroup> dkdms () const {
 		return _dkdms;
 	}
 
@@ -431,6 +436,10 @@ public:
 		maybe_set (_default_container, c);
 	}
 
+	void set_default_scale_to (Ratio const * c) {
+		maybe_set (_default_scale_to, c);
+	}
+
 	void set_default_dcp_content_type (DCPContentType const * t) {
 		maybe_set (_default_dcp_content_type, t);
 	}
@@ -538,7 +547,7 @@ public:
 	}
 #endif
 
-	void set_dkdms (std::vector<dcp::EncryptedKDM> dkdms) {
+	void set_dkdms (boost::shared_ptr<DKDMGroup> dkdms) {
 		_dkdms = dkdms;
 		changed ();
 	}
@@ -697,6 +706,7 @@ private:
  	/** Default length of still image content (seconds) */
 	int _default_still_length;
 	Ratio const * _default_container;
+	Ratio const * _default_scale_to;
 	DCPContentType const * _default_dcp_content_type;
 	int _default_dcp_audio_channels;
 	std::string _dcp_issuer;
@@ -735,7 +745,7 @@ private:
 	bool _win32_console;
 #endif
 	std::vector<boost::filesystem::path> _history;
-	std::vector<dcp::EncryptedKDM> _dkdms;
+	boost::shared_ptr<DKDMGroup> _dkdms;
 	boost::filesystem::path _cinemas_file;
 	bool _show_hints_before_make_dcp;
 	bool _confirm_kdm_email;