Use content version from Interop (or version number from SMPTE metadata)

[dcpomatic.git] / src / lib / isdcf_metadata.cc

diff --git a/src/lib/isdcf_metadata.cc b/src/lib/isdcf_metadata.cc
index f4b25662648788856ffb2de692d2a8738b6ff12d..4f157ce70b1166f1dc503ae1696d8c7409f5dd48 100644 (file)
--- a/src/lib/isdcf_metadata.cc
+++ b/src/lib/isdcf_metadata.cc
@@ -30,14 +30,11 @@ DCPOMATIC_ENABLE_WARNINGS
 #include "i18n.h"
 
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 using dcp::raw_convert;
 
 ISDCFMetadata::ISDCFMetadata (cxml::ConstNodePtr node)
-       : content_version (node->number_child<int> ("ContentVersion"))
-       , audio_language (node->string_child ("AudioLanguage"))
-       , subtitle_language (node->optional_string_child("SubtitleLanguage"))
-       , territory (node->string_child ("Territory"))
+       : territory (node->string_child ("Territory"))
        , rating (node->string_child ("Rating"))
        , studio (node->string_child ("Studio"))
        , facility (node->string_child ("Facility"))
@@ -55,11 +52,6 @@ ISDCFMetadata::ISDCFMetadata (cxml::ConstNodePtr node)
 void
 ISDCFMetadata::as_xml (xmlpp::Node* root) const
 {
-       root->add_child("ContentVersion")->add_child_text (raw_convert<string> (content_version));
-       if (subtitle_language) {
-               root->add_child("SubtitleLanguage")->add_child_text (*subtitle_language);
-       }
-       root->add_child("AudioLanguage")->add_child_text (audio_language);
        root->add_child("Territory")->add_child_text (territory);
        root->add_child("Rating")->add_child_text (rating);
        root->add_child("Studio")->add_child_text (studio);
@@ -75,10 +67,7 @@ ISDCFMetadata::as_xml (xmlpp::Node* root) const
 bool
 operator== (ISDCFMetadata const & a, ISDCFMetadata const & b)
 {
-       return a.content_version == b.content_version &&
-              a.subtitle_language == b.subtitle_language &&
-               a.audio_language == b.audio_language &&
-               a.territory == b.territory &&
+        return a.territory == b.territory &&
                a.rating == b.rating &&
                a.studio == b.studio &&
                a.facility == b.facility &&