Show maximum pixel error on equals().

[libdcp.git] / src / cpl.h

diff --git a/src/cpl.h b/src/cpl.h
index 643a243beec84f9250471da025b963d2539b8271..a0426b96d29a2bddfb7a19772e19c37d25fde740 100644 (file)
--- a/src/cpl.h
+++ b/src/cpl.h
@@ -1,3 +1,4 @@
+#include <stdint.h>
 #include <boost/shared_ptr.hpp>
 #include "xml.h"
 
@@ -12,9 +13,9 @@ public:
        std::string id;
        std::string annotation_text;
        Fraction edit_rate;
-       int intrinsic_duration;
-       int entry_point;
-       int duration;
+       int64_t intrinsic_duration;
+       int64_t entry_point;
+       int64_t duration;
        Fraction frame_rate;
        Fraction screen_aspect_ratio;
 };
@@ -28,9 +29,9 @@ public:
        std::string id;
        std::string annotation_text;
        Fraction edit_rate;
-       int intrinsic_duration;
-       int entry_point;
-       int duration;
+       int64_t intrinsic_duration;
+       int64_t entry_point;
+       int64_t duration;
 };
 
 class CPLAssetList : public XMLNode
@@ -53,15 +54,6 @@ public:
        boost::shared_ptr<CPLAssetList> asset_list;
 };
 
-class ReelList : public XMLNode
-{
-public:
-       ReelList () {}
-       ReelList (xmlpp::Node const * node);
-
-       std::list<boost::shared_ptr<Reel> > reels;
-};
-
 class ContentVersion : public XMLNode
 {
 public:
@@ -82,9 +74,9 @@ public:
        std::string issue_date;
        std::string creator;
        std::string content_title_text;
-       std::string content_kind;
+       ContentKind content_kind;
        boost::shared_ptr<ContentVersion> content_version;
-       boost::shared_ptr<ReelList> reel_list;
+       std::list<boost::shared_ptr<Reel> > reels;
 };
 
 }