Use studio and facility from Interop/SMPTE metadata rather than ISDCF.

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

diff --git a/src/lib/isdcf_metadata.cc b/src/lib/isdcf_metadata.cc
index 1b424c925d90028c11693ccf428265b028cf762f..eb8bcb1a543af2c64fd44830573c8c8adb617c09 100644 (file)
--- a/src/lib/isdcf_metadata.cc
+++ b/src/lib/isdcf_metadata.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -19,27 +19,22 @@
 */
 
 #include "isdcf_metadata.h"
+#include "warnings.h"
 #include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <iostream>
 
 #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->string_child ("SubtitleLanguage"))
-       , territory (node->string_child ("Territory"))
-       , rating (node->string_child ("Rating"))
-       , studio (node->string_child ("Studio"))
-       , facility (node->string_child ("Facility"))
-       /* This stuff was added later */
-       , temp_version (node->optional_bool_child ("TempVersion").get_value_or (false))
+       : temp_version (node->optional_bool_child ("TempVersion").get_value_or (false))
        , pre_release (node->optional_bool_child ("PreRelease").get_value_or (false))
        , red_band (node->optional_bool_child ("RedBand").get_value_or (false))
        , chain (node->optional_string_child ("Chain").get_value_or (""))
@@ -52,13 +47,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));
-       root->add_child("AudioLanguage")->add_child_text (audio_language);
-       root->add_child("SubtitleLanguage")->add_child_text (subtitle_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);
-       root->add_child("Facility")->add_child_text (facility);
        root->add_child("TempVersion")->add_child_text (temp_version ? "1" : "0");
        root->add_child("PreRelease")->add_child_text (pre_release ? "1" : "0");
        root->add_child("RedBand")->add_child_text (red_band ? "1" : "0");
@@ -70,14 +58,7 @@ ISDCFMetadata::as_xml (xmlpp::Node* root) const
 bool
 operator== (ISDCFMetadata const & a, ISDCFMetadata const & b)
 {
-       return a.content_version == b.content_version &&
-               a.audio_language == b.audio_language &&
-               a.subtitle_language == b.subtitle_language &&
-               a.territory == b.territory &&
-               a.rating == b.rating &&
-               a.studio == b.studio &&
-               a.facility == b.facility &&
-               a.temp_version == b.temp_version &&
+        return a.temp_version == b.temp_version &&
                a.pre_release == b.pre_release &&
                a.red_band == b.red_band &&
                a.chain == b.chain &&