Merge.

[libdcp.git] / src / types.h

diff --git a/src/types.h b/src/types.h
index 63f52f3e7e8e127f14dbd77f3bdd1ef9fd362859..ee3edaef0c29fb4e320cab891e31c22f2523422d 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -37,7 +37,7 @@ enum Channel {
        RS = 5       ///< right surround
 };
 
-enum ContentType
+enum ContentKind
 {
        FEATURE,
        SHORT,
@@ -51,6 +51,23 @@ enum ContentType
        ADVERTISEMENT
 };
 
+class Fraction
+{
+public:
+       Fraction () : numerator (0), denominator (0) {}
+       Fraction (std::string s);
+       Fraction (int n, int d) : numerator (n), denominator (d) {}
+
+       int numerator;
+       int denominator;
+};
+
+enum EqualityFlags {
+       LIBDCP_METADATA = 0x1,
+       MXF_BITWISE = 0x2,
+       MXF_INSPECT = 0x4
+};
+
 }
 
 #endif