diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-04-02 23:43:54 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-04-02 23:43:54 +0000 |
| commit | 698e3ac8863d264237003b49750ae074d612f451 (patch) | |
| tree | a6ef673ad68c1fb43844dd23482c7a97514b3918 /src/lib/isdcf_metadata.cc | |
| parent | d5c8fb9b826aaac2acab58f8a7b2eec4fcce99a6 (diff) | |
Extract subtitle language from text content rather than ISDCFMetadata (part of #1516).
Diffstat (limited to 'src/lib/isdcf_metadata.cc')
| -rw-r--r-- | src/lib/isdcf_metadata.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/lib/isdcf_metadata.cc b/src/lib/isdcf_metadata.cc index 1b424c925..5e689ee27 100644 --- 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. @@ -33,7 +33,6 @@ 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")) @@ -54,7 +53,6 @@ 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); @@ -72,7 +70,6 @@ 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 && |