Introduce SMPTEFlavour and use it to decide which optional things to write.

This also adds a possibly-correct idea of what "SMPTE A" is supposed to mean.

1 files changed, 10 insertions, 2 deletions

diff --git a/src/dcp.cc b/src/dcp.cc
index eb21b47d..2b44b6c1 100644
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -447,7 +447,11 @@ DCP::write_volindex (Standard standard) const
 
 
 void
-DCP::write_xml(shared_ptr<const CertificateChain> signer, bool include_mca_subdescriptors, NameFormat name_format)
+DCP::write_xml(
+	shared_ptr<const CertificateChain> signer,
+	SMPTEFlavour flavour,
+	NameFormat name_format
+	)
 {
 	if (_cpls.empty()) {
 		throw MiscError ("Cannot write DCP with no CPLs.");
@@ -466,7 +470,11 @@ DCP::write_xml(shared_ptr<const CertificateChain> signer, bool include_mca_subde
 	for (auto i: cpls()) {
 		NameFormat::Map values;
 		values['t'] = "cpl";
-		i->write_xml(_directory / (name_format.get(values, "_" + i->id() + ".xml")), signer, include_mca_subdescriptors);
+		i->write_xml(
+			_directory / (name_format.get(values, "_" + i->id() + ".xml")),
+			signer,
+			flavour
+			);
 	}
 
 	if (_pkls.empty()) {