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, 4 insertions, 5 deletions

diff --git a/src/cpl.h b/src/cpl.h
index 824faaa1..a7c33d59 100644
--- a/src/cpl.h
+++ b/src/cpl.h
@@ -47,6 +47,7 @@
 #include "key.h"
 #include "language_tag.h"
 #include "rating.h"
+#include "smpte_flavour.h"
 #include "verify.h"
 #include <boost/filesystem.hpp>
 #include <boost/function.hpp>
@@ -127,13 +128,11 @@ public:
 	 *
 	 *  @param file Filename to write
 	 *  @param signer Signer to sign the CPL, or 0 to add no signature
-	 *  @param include_mca_subdescriptors true to add a MCASubDescriptors tag to metadata,
-	 *  false to omit it.
 	 */
-	void write_xml (
+	void write_xml(
 		boost::filesystem::path file,
 		std::shared_ptr<const CertificateChain>,
-		bool include_mca_subdescriptors = true
+		SMPTEFlavour flavour = SMPTEFlavour::BV21
 		) const;
 
 	void resolve_refs (std::vector<std::shared_ptr<Asset>>);
@@ -358,7 +357,7 @@ protected:
 private:
 	friend struct ::verify_invalid_language3;
 
-	void maybe_write_composition_metadata_asset(xmlpp::Element* node, bool include_mca_subdescriptors) const;
+	void maybe_write_composition_metadata_asset(xmlpp::Element* node, SMPTEFlavour flavour) const;
 	void read_composition_metadata_asset (cxml::ConstNodePtr node);
 	void write_mca_subdescriptors(xmlpp::Element* parent, std::shared_ptr<const SoundAsset> asset) const;