Add include_mca_subdescriptors to DCP::write_xml(), passing it through to the CPL.

2 files changed, 5 insertions, 4 deletions

diff --git a/src/dcp.cc b/src/dcp.cc
index df5c89b4..02ff048f 100644
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -400,7 +400,7 @@ DCP::write_volindex (Standard standard) const
 
 
 void
-DCP::write_xml (shared_ptr<const CertificateChain> signer, NameFormat name_format)
+DCP::write_xml(shared_ptr<const CertificateChain> signer, bool include_mca_subdescriptors, NameFormat name_format)
 {
 	if (_cpls.empty()) {
 		throw MiscError ("Cannot write DCP with no CPLs.");
@@ -419,7 +419,7 @@ DCP::write_xml (shared_ptr<const CertificateChain> signer, NameFormat name_forma
 	for (auto i: cpls()) {
 		NameFormat::Map values;
 		values['t'] = "cpl";
-		i->write_xml (_directory / (name_format.get(values, "_" + i->id() + ".xml")), signer);
+		i->write_xml(_directory / (name_format.get(values, "_" + i->id() + ".xml")), signer, include_mca_subdescriptors);
 	}
 
 	if (_pkls.empty()) {
diff --git a/src/dcp.h b/src/dcp.h
index 7d3d670a..8ce6a96d 100644
--- a/src/dcp.h
+++ b/src/dcp.h
@@ -151,12 +151,13 @@ public:
 	void set_annotation_text(std::string annotation_text);
 
 	/** Write all the XML files for this DCP.
-	 *  @param standand INTEROP or SMPTE
 	 *  @param signer Signer to use
+	 *  @param include_mca_subdescriptors true to write MCA subdescriptors to CPLs.
 	 *  @param name_format Name format to use for the CPL and PKL filenames
 	 */
-	void write_xml (
+	void write_xml(
 		std::shared_ptr<const CertificateChain> signer = std::shared_ptr<const CertificateChain>(),
+		bool include_mca_subdescriptors = false,
 		NameFormat name_format = NameFormat("%t")
 	);