Store subtitle language(s) in Film, and allow setup of those

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

diff --git a/src/lib/isdcf_metadata.cc b/src/lib/isdcf_metadata.cc
index 0d7d02cde52ce0447677814b68baf2e7a0726b5d..e117dc28445be008e3bea71c2801ed4fa1d5f4c1 100644 (file)
--- a/src/lib/isdcf_metadata.cc
+++ b/src/lib/isdcf_metadata.cc
@@ -19,9 +19,12 @@
 */
 
 #include "isdcf_metadata.h"
 */
 
 #include "isdcf_metadata.h"

+#include "warnings.h"

 #include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
 #include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>

+DCPOMATIC_DISABLE_WARNINGS

 #include <libxml++/libxml++.h>
 #include <libxml++/libxml++.h>

+DCPOMATIC_ENABLE_WARNINGS

 #include <iostream>
 
 #include "i18n.h"
 #include <iostream>
 
 #include "i18n.h"


@@ -33,8 +36,6 @@ using dcp::raw_convert;
 ISDCFMetadata::ISDCFMetadata (cxml::ConstNodePtr node)
        : content_version (node->number_child<int> ("ContentVersion"))
        , audio_language (node->string_child ("AudioLanguage"))
 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")))

        , territory (node->string_child ("Territory"))
        , rating (node->string_child ("Rating"))
        , studio (node->string_child ("Studio"))
        , territory (node->string_child ("Territory"))
        , rating (node->string_child ("Rating"))
        , studio (node->string_child ("Studio"))