Merge master.

1 files changed, 88 insertions, 0 deletions

diff --git a/src/lib/isdcf_metadata.cc b/src/lib/isdcf_metadata.cc
new file mode 100644
index 000000000..7d960b6ac
--- /dev/null
+++ b/src/lib/isdcf_metadata.cc
@@ -0,0 +1,88 @@
+/*
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+
+    This program 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,
+    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.
+
+*/
+
+#include <iostream>
+#include <libcxml/cxml.h>
+#include <dcp/raw_convert.h>
+#include "isdcf_metadata.h"
+
+#include "i18n.h"
+
+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");
+	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 ("");
+}
+
+void
+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);
+	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;
+	}
+}