X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fisdcf_metadata.cc;h=a6461727e3dd10a5fb8b362cd4819fa495442194;hb=89ad6c484689ca399d0960803df75374b7a63490;hp=9d9d825f53b9801b5aa4beec7535c054ecff641a;hpb=a112eeb4d052b1212f94e95efd83a215213da691;p=dcpomatic.git

diff --git a/src/lib/isdcf_metadata.cc b/src/lib/isdcf_metadata.cc
index 9d9d825f5..a6461727e 100644
--- a/src/lib/isdcf_metadata.cc
+++ b/src/lib/isdcf_metadata.cc
@@ -17,16 +17,16 @@
 
 */
 
-#include <iostream>
-#include <libcxml/cxml.h>
-#include <dcp/raw_convert.h>
 #include "isdcf_metadata.h"
+#include "raw_convert.h"
+#include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
+#include <iostream>
 
 #include "i18n.h"
 
 using std::string;
 using boost::shared_ptr;
-using dcp::raw_convert;
 
 ISDCFMetadata::ISDCFMetadata (cxml::ConstNodePtr node)
 	: content_version (node->number_child<int> ("ContentVersion"))
@@ -36,7 +36,6 @@ ISDCFMetadata::ISDCFMetadata (cxml::ConstNodePtr node)
 	, rating (node->string_child ("Rating"))
 	, studio (node->string_child ("Studio"))
 	, facility (node->string_child ("Facility"))
-	, package_type (node->string_child ("PackageType"))
 	/* This stuff was added later */
 	, temp_version (node->optional_bool_child ("TempVersion").get_value_or (false))
 	, pre_release (node->optional_bool_child ("PreRelease").get_value_or (false))
@@ -45,7 +44,7 @@ ISDCFMetadata::ISDCFMetadata (cxml::ConstNodePtr node)
 	, two_d_version_of_three_d (node->optional_bool_child ("TwoDVersionOfThreeD").get_value_or (false))
 	, mastered_luminance (node->optional_string_child ("MasteredLuminance").get_value_or (""))
 {
-	
+
 }
 
 void
@@ -58,7 +57,6 @@ ISDCFMetadata::as_xml (xmlpp::Node* root) const
 	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("PackageType")->add_child_text (package_type);
 	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");
@@ -66,3 +64,21 @@ ISDCFMetadata::as_xml (xmlpp::Node* root) const
 	root->add_child("TwoDVersionOfThreeD")->add_child_text (two_d_version_of_three_d ? "1" : "0");
 	root->add_child("MasteredLuminance")->add_child_text (mastered_luminance);
 }
+
+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 &&
+               a.pre_release == b.pre_release &&
+               a.red_band == b.red_band &&
+               a.chain == b.chain &&
+               a.two_d_version_of_three_d == b.two_d_version_of_three_d &&
+               a.mastered_luminance == b.mastered_luminance;
+}