Merge.

1 files changed, 9 insertions, 0 deletions

diff --git a/src/lib/config.h b/src/lib/config.h
index 1bdbcb96e..c02b12eb5 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -286,6 +286,10 @@ public:
 		return _confirm_kdm_email;
 	}
 
+	dcp::NameFormat kdm_container_name_format () const {
+		return _kdm_container_name_format;
+	}
+
 	dcp::NameFormat kdm_filename_format () const {
 		return _kdm_filename_format;
 	}
@@ -513,6 +517,10 @@ public:
 		maybe_set (_confirm_kdm_email, s);
 	}
 
+	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);
 	}
@@ -650,6 +658,7 @@ private:
 	bool _show_hints_before_make_dcp;
 	bool _confirm_kdm_email;
 	dcp::NameFormat _kdm_filename_format;
+	dcp::NameFormat _kdm_container_name_format;
 	dcp::NameFormat _dcp_metadata_filename_format;
 	dcp::NameFormat _dcp_asset_filename_format;