add audioFormatExtended version

Author: tomjnixon

include/adm/document.hpp

@@ -2,16 +2,24 @@
 #pragma once
 
 #include <memory>
+#include <string>
 #include <vector>
 #include "adm/elements.hpp"
 #include "adm/detail/auto_base.hpp"
 #include "adm/detail/id_assigner.hpp"
+#include "adm/detail/named_type.hpp"
 #include "adm/export.h"
 
 namespace adm {
 
+  /// tag for version
+  struct VersionTag {};
+  /// NamedType for audioFormatExtended version attribute
+  using Version = detail::NamedType<std::string, VersionTag>;
+
   namespace detail {
-    using DocumentBase = HasParameters<OptionalParameter<ProfileList>>;
+    using DocumentBase = HasParameters<OptionalParameter<ProfileList>,
+                                       OptionalParameter<Version>>;
   }
 
   /**
@@ -266,6 +274,8 @@ namespace adm {
 
     using detail::DocumentBase::get;
     using detail::DocumentBase::has;
+    using detail::DocumentBase::isDefault;
+    using detail::DocumentBase::unset;
 
     friend class detail::AddWrapperMethods<Document>;
 

src/private/xml_parser.cpp

@@ -97,6 +97,8 @@ namespace adm {
         resolveReference(streamFormatChannelFormatRef_);
         resolveReference(streamFormatPackFormatRef_);
         resolveReferences(streamFormatTrackFormatRefs_);
+
+        setOptionalAttribute<Version>(root, "version", document_);
       } else {
         throw error::XmlParsingError("audioFormatExtended node not found");
       }

src/private/xml_writer.cpp

@@ -38,6 +38,7 @@ namespace adm {
         root = xmlDocument.addEbuStructure();
       }
       // clang-format off
+      root.addOptionalAttribute<Version>(document, "version");
       root.addOptionalElement<ProfileList>(document, "profileList", &formatProfileList);
       root.addBaseElements<AudioProgramme, AudioProgrammeId>(document, "audioProgramme", &formatAudioProgramme);
       root.addBaseElements<AudioContent, AudioContentId>(document, "audioContent", &formatAudioContent);

tests/CMakeLists.txt

@@ -69,6 +69,7 @@ add_adm_test("route_tracer_tests")
 add_adm_test("screen_edge_lock_tests")
 add_adm_test("speaker_position_tests")
 add_adm_test("type_descriptor_tests")
+add_adm_test("version_tests")
 add_adm_test("xml_audio_block_format_objects_tests")
 add_adm_test("xml_loudness_metadata_tests")
 add_adm_test("xml_parser_audio_block_format_direct_speakers_tests")

tests/test_data/version.accepted.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ebuCoreMain xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns="urn:ebu:metadata-schema:ebuCore_2014" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schema="EBU_CORE_20140201.xsd" xml:lang="en">
+	<coreMetadata>
+		<format>
+			<audioFormatExtended version="ITU-R_BS.2076-2"/>
+		</format>
+	</coreMetadata>
+</ebuCoreMain>
+

tests/test_data/xml_parser/version.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ebuCoreMain>
+  <coreMetadata>
+    <format>
+      <audioFormatExtended version="ITU-R_BS.2076-2">
+      </audioFormatExtended>
+    </format>
+  </coreMetadata>
+</ebuCoreMain>

tests/version_tests.cpp

@@ -0,0 +1,29 @@
+#include <catch2/catch.hpp>
+#include "adm/elements/profile_list.hpp"
+#include "helper/parameter_checks.hpp"
+#include "adm/document.hpp"
+#include "adm/parse.hpp"
+#include "adm/write.hpp"
+#include "helper/file_comparator.hpp"
+
+using namespace adm;
+using namespace adm_test;
+
+TEST_CASE("version") {
+  auto document = Document::create();
+
+  check_optional_param<Version>(document,
+                                canBeSetTo(Version{"ITU-R_BS.2076-2"}));
+}
+
+TEST_CASE("xml/version") {
+  auto document = parseXml("xml_parser/version.xml");
+
+  REQUIRE(document->has<Version>());
+  REQUIRE(document->get<Version>().get() == "ITU-R_BS.2076-2");
+
+  std::stringstream xml;
+  writeXml(xml, document);
+
+  CHECK_THAT(xml.str(), EqualsXmlFile("version"));
+}