Merge master.

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

diff --git a/src/lib/dci_metadata.cc b/src/lib/dci_metadata.cc
index f25b3ddb00508157065b682c20a626b3de965f4d..2c6e43654915b239d94f4ff6acb61df9389d42fa 100644 (file)
--- a/src/lib/dci_metadata.cc
+++ b/src/lib/dci_metadata.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    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
@@ -19,15 +19,18 @@
 
 #include <iostream>
 #include <libcxml/cxml.h>
+#include <dcp/raw_convert.h>
 #include "dci_metadata.h"
 
 #include "i18n.h"
 
 using std::string;
 using boost::shared_ptr;
+using dcp::raw_convert;
 
 DCIMetadata::DCIMetadata (shared_ptr<const cxml::Node> 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");
@@ -40,6 +43,7 @@ DCIMetadata::DCIMetadata (shared_ptr<const cxml::Node> node)
 void
 DCIMetadata::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);