A few more untested bits.

[libdcp.git] / src / types.h

diff --git a/src/types.h b/src/types.h
index 7c98a3b352ff4b7d588975b0c268174e23fc4bf0..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
@@ -58,6 +60,9 @@ enum Effect
        SHADOW
 };
 
+extern std::string effect_to_string (Effect e);
+extern Effect string_to_effect (std::string s);
+
 enum VAlign
 {
        TOP,
@@ -65,6 +70,9 @@ enum VAlign
        BOTTOM
 };
 
+extern std::string valign_to_string (VAlign a);
+extern VAlign string_to_valign (std::string s);
+
 enum Eye
 {
        EYE_LEFT,
@@ -86,13 +94,15 @@ extern bool operator== (Fraction const & a, Fraction const & b);
 extern bool operator!= (Fraction const & a, Fraction const & b);
        
 struct EqualityOptions {
-       /** true to do a bitwise comparison.
-        *  false to compare PCM and image data, possibly allowing
-        *  some variation in values.
-        */
-       bool bitwise;
+       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
@@ -105,9 +115,12 @@ public:
        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);
 
 }