X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fisdcf_metadata.cc;h=c333325a126f52b1b8321ecf83809d70b2e93827;hb=5a649b6d803697388925d7cd64ec5f0da345f865;hp=0d7d02cde52ce0447677814b68baf2e7a0726b5d;hpb=cd22846b748141261db1243588fe11d1a1504ce4;p=dcpomatic.git

diff --git a/src/lib/isdcf_metadata.cc b/src/lib/isdcf_metadata.cc
index 0d7d02cde..c333325a1 100644
--- a/src/lib/isdcf_metadata.cc
+++ b/src/lib/isdcf_metadata.cc
@@ -33,8 +33,7 @@ using dcp::raw_convert;
 ISDCFMetadata::ISDCFMetadata (cxml::ConstNodePtr node)
 	: content_version (node->number_child<int> ("ContentVersion"))
 	, audio_language (node->string_child ("AudioLanguage"))
-	  /* Old versions contained this tag, but not these details are held in content */
-	, has_subtitle_language (static_cast<bool>(node->optional_node_child("SubtitleLanguage")))
+	, subtitle_language (node->optional_string_child("SubtitleLanguage"))
 	, territory (node->string_child ("Territory"))
 	, rating (node->string_child ("Rating"))
 	, studio (node->string_child ("Studio"))
@@ -54,6 +53,9 @@ 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);
@@ -71,6 +73,7 @@ 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 &&
                a.rating == b.rating &&