A few more untested bits.

[libdcp.git] / src / types.h

diff --git a/src/types.h b/src/types.h
index 8c58457995659e23fb60d53a2f3e7bc5a9d40f5e..433a910cddf9423ca9d63281f881a2419beaa9dc 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -29,12 +29,14 @@ namespace libdcp
 
 /** Identifier for a sound channel */
 enum Channel {
-       LEFT = 0,    ///< left
-       RIGHT = 1,   ///< right
-       CENTRE = 2,  ///< centre
-       LFE = 3,     ///< low-frequency effects (sub)
-       LS = 4,      ///< left surround
-       RS = 5       ///< right surround
+       LEFT = 0,      ///< left
+       RIGHT = 1,     ///< right
+       CENTRE = 2,    ///< centre
+       LFE = 3,       ///< low-frequency effects (sub)
+       LS = 4,        ///< left surround
+       RS = 5,        ///< right surround
+       CHANNEL_7 = 6, ///< channel 7; not sure what this should be called
+       CHANNEL_8 = 7  ///< channel 8; not sure what this should be called
 };
 
 enum ContentKind
@@ -51,6 +53,32 @@ enum ContentKind
        ADVERTISEMENT
 };
 
+enum Effect
+{
+       NONE,
+       BORDER,
+       SHADOW
+};
+
+extern std::string effect_to_string (Effect e);
+extern Effect string_to_effect (std::string s);
+
+enum VAlign
+{
+       TOP,
+       CENTER,
+       BOTTOM
+};
+
+extern std::string valign_to_string (VAlign a);
+extern VAlign string_to_valign (std::string s);
+
+enum Eye
+{
+       EYE_LEFT,
+       EYE_RIGHT
+};
+       
 class Fraction
 {
 public:
@@ -62,19 +90,38 @@ public:
        int denominator;
 };
 
-enum EqualityFlags {
-       LIBDCP_METADATA = 0x1,
-       MXF_BITWISE = 0x2,
-       MXF_INSPECT = 0x4
-};
-
+extern bool operator== (Fraction const & a, Fraction const & b);
+extern bool operator!= (Fraction const & a, Fraction const & b);
+       
 struct EqualityOptions {
-       EqualityFlags flags;
-       bool verbose;
+       EqualityOptions () 
+               : max_mean_pixel_error (0)
+               , max_std_dev_pixel_error (0)
+               , max_audio_sample_error (0)
+       {}
+
        double max_mean_pixel_error;
        double max_std_dev_pixel_error;
+       int max_audio_sample_error;
+};
+
+class Color
+{
+public:
+       Color ();
+       Color (int r_, int g_, int b_);
+       Color (std::string argb_hex);
+
+       int r;
+       int g;
+       int b;
+
+       std::string to_argb_string () const;
 };
-               
+
+extern bool operator== (Color const & a, Color const & b);
+extern bool operator!= (Color const & a, Color const & b);
+extern std::ostream & operator<< (std::ostream & s, Color const & c);
 
 }