Merge master.

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

diff --git a/src/lib/dci_metadata.h b/src/lib/dci_metadata.h
index eecdc765511a6ac2d6fa83301eb647cd1e78fab9..6563ff95c50c9d797374b90c0f6437ac66d4493b 100644 (file)
--- a/src/lib/dci_metadata.h
+++ b/src/lib/dci_metadata.h
@@ -17,17 +17,26 @@
 
 */
 
-#ifndef DVDOMATIC_DCI_METADATA_H
-#define DVDOMATIC_DCI_METADATA_H
+#ifndef DCPOMATIC_DCI_METADATA_H
+#define DCPOMATIC_DCI_METADATA_H
 
 #include <string>
+#include <libxml++/libxml++.h>
+#include <libcxml/cxml.h>
 
 class DCIMetadata
 {
 public:
-       void read (std::string, std::string);
-       void write (std::ostream &) const;
+       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;