Merge master.

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

diff --git a/src/lib/dci_metadata.h b/src/lib/dci_metadata.h
index b87609ed0060224e573186f109c213aa2a074911..6563ff95c50c9d797374b90c0f6437ac66d4493b 100644 (file)
--- a/src/lib/dci_metadata.h
+++ b/src/lib/dci_metadata.h
@@ -22,20 +22,21 @@
 
 #include <string>
 #include <libxml++/libxml++.h>
-
-namespace cxml {
-       class Node;
-}
+#include <libcxml/cxml.h>
 
 class DCIMetadata
 {
 public:
-       DCIMetadata () {}
-       DCIMetadata (boost::shared_ptr<const cxml::Node>);
+       DCIMetadata ()
+               : content_version (1)
+       {}
+       
+       DCIMetadata (cxml::ConstNodePtr);
 
        void as_xml (xmlpp::Node *) const;
        void read_old_metadata (std::string, std::string);
-       
+
+       int content_version;
        std::string audio_language;
        std::string subtitle_language;
        std::string territory;