Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0

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

diff --git a/src/lib/isdcf_metadata.cc b/src/lib/isdcf_metadata.cc
index ae99280ca4de666d26aa526fe5f28a0f4e01702a..9d9d825f53b9801b5aa4beec7535c054ecff641a 100644 (file)
--- a/src/lib/isdcf_metadata.cc
+++ b/src/lib/isdcf_metadata.cc
@@ -19,25 +19,33 @@
 
 #include <iostream>
 #include <libcxml/cxml.h>
-#include <libdcp/raw_convert.h>
+#include <dcp/raw_convert.h>
 #include "isdcf_metadata.h"
 
 #include "i18n.h"
 
 using std::string;
 using boost::shared_ptr;
-using libdcp::raw_convert;
+using dcp::raw_convert;
 
-ISDCFMetadata::ISDCFMetadata (shared_ptr<const cxml::Node> node)
+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"))
+       , 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))
+       , red_band (node->optional_bool_child ("RedBand").get_value_or (false))
+       , chain (node->optional_string_child ("Chain").get_value_or (""))
+       , 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 (""))
 {
-       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");
-       facility = node->string_child ("Facility");
-       package_type = node->string_child ("PackageType");
+       
 }
 
 void
@@ -51,24 +59,10 @@ ISDCFMetadata::as_xml (xmlpp::Node* root) const
        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");
+       root->add_child("Chain")->add_child_text (chain);
+       root->add_child("TwoDVersionOfThreeD")->add_child_text (two_d_version_of_three_d ? "1" : "0");
+       root->add_child("MasteredLuminance")->add_child_text (mastered_luminance);
 }
-
-void
-ISDCFMetadata::read_old_metadata (string k, string v)
-{
-       if (k == N_("audio_language")) {
-               audio_language = v;
-       } else if (k == N_("subtitle_language")) {
-               subtitle_language = v;
-       } else if (k == N_("territory")) {
-               territory = v;
-       } else if (k == N_("rating")) {
-               rating = v;
-       } else if (k == N_("studio")) {
-               studio = v;
-       } else if (k == N_("facility")) {
-               facility = v;
-       } else if (k == N_("package_type")) {
-               package_type = v;
-       }
-}