X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fisdcf_metadata.cc;h=c333325a126f52b1b8321ecf83809d70b2e93827;hp=f201844ca7210dcdbf922fc26cb6195aff1a2497;hb=8f12e84009d7c2685bb2eeb32665876463d4e6e5;hpb=14e4bc18e65378332604016bd6239861a083d5bf

diff --git a/src/lib/isdcf_metadata.cc b/src/lib/isdcf_metadata.cc
index f201844ca..c333325a1 100644
--- a/src/lib/isdcf_metadata.cc
+++ b/src/lib/isdcf_metadata.cc
@@ -1,24 +1,25 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 #include "isdcf_metadata.h"
-#include "raw_convert.h"
+#include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <iostream>
@@ -27,16 +28,16 @@
 
 using std::string;
 using boost::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"))
+	, subtitle_language (node->optional_string_child("SubtitleLanguage"))
 	, territory (node->string_child ("Territory"))
 	, 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))
@@ -52,13 +53,14 @@ 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("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("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");
@@ -71,13 +73,12 @@ 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.subtitle_language == b.subtitle_language &&
                a.territory == b.territory &&
                a.rating == b.rating &&
                a.studio == b.studio &&
                a.facility == b.facility &&
-               a.package_type == b.package_type &&
                a.temp_version == b.temp_version &&
                a.pre_release == b.pre_release &&
                a.red_band == b.red_band &&