Try to fix clashes caused by ERROR, WARNING etc. as variables.

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

diff --git a/src/lib/dci_metadata.h b/src/lib/dci_metadata.h
index f61dae5a80bbe46e9926bd9c494fbdea6c617989..738e439de5cbe789828c978d64b95124ef423d50 100644 (file)
--- a/src/lib/dci_metadata.h
+++ b/src/lib/dci_metadata.h
@@ -17,8 +17,8 @@
 
 */
 
-#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>
@@ -30,12 +30,16 @@ namespace cxml {
 class DCIMetadata
 {
 public:
-       DCIMetadata () {}
+       DCIMetadata ()
+               : content_version (1)
+       {}
+       
        DCIMetadata (boost::shared_ptr<const cxml::Node>);
 
        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;